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

No match.