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


Trivial merge