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

No match.