[dali_1.3.31] Merge branch 'devel/master' 42/183542/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 6 Jul 2018 09:37:54 +0000 (10:37 +0100)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 6 Jul 2018 09:37:54 +0000 (10:37 +0100)
Change-Id: I544db79d472f218855e8a850bcf82e9136e74ed2


Trivial merge