[dali_1.3.18] Merge branch 'devel/master'

No match.