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


Trivial merge