[dali_1.3.30] Merge branch 'devel/master' 03/183003/1
authoradam.b <adam.b@samsung.com>
Fri, 29 Jun 2018 12:51:27 +0000 (13:51 +0100)
committeradam.b <adam.b@samsung.com>
Fri, 29 Jun 2018 12:51:27 +0000 (13:51 +0100)
Change-Id: Ifcf5f40a44a3588dce522d27801d84a72c6999a7


Trivial merge