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


Trivial merge