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


Trivial merge