[dali_1.4.4] Merge branch 'devel/master' 74/198574/1
authoradam.b <adam.b@samsung.com>
Fri, 25 Jan 2019 12:21:10 +0000 (12:21 +0000)
committeradam.b <adam.b@samsung.com>
Fri, 25 Jan 2019 12:21:10 +0000 (12:21 +0000)
Change-Id: Ife16c278d0f4e65dc09e3f164deae6b12a41e1eb


Trivial merge