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


Trivial merge