[dali_1.3.11] Merge branch 'devel/master' 23/169823/1
authoradam.b <adam.b@samsung.com>
Fri, 9 Feb 2018 11:09:30 +0000 (11:09 +0000)
committeradam.b <adam.b@samsung.com>
Fri, 9 Feb 2018 11:09:30 +0000 (11:09 +0000)
Change-Id: I7d6f9b4e7ebcaef311c37f3ba5357cdaff79cea2


Trivial merge