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

No match.