[dali_1.3.20] Merge branch 'devel/master' 30/175930/1
authoradam.b <adam.b@samsung.com>
Fri, 13 Apr 2018 10:49:39 +0000 (11:49 +0100)
committeradam.b <adam.b@samsung.com>
Fri, 13 Apr 2018 10:49:39 +0000 (11:49 +0100)
Change-Id: I82e9a75ed7be02bacba7ddd26428537a66e5dad3


Trivial merge