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

No match.