[dali_1.2.56] Merge branch 'devel/master' 62/148662/1
authoradam.b <adam.b@samsung.com>
Fri, 8 Sep 2017 08:28:05 +0000 (09:28 +0100)
committeradam.b <adam.b@samsung.com>
Fri, 8 Sep 2017 08:28:05 +0000 (09:28 +0100)
Change-Id: Id704f998408c48d714e014661b876008775caf27


Trivial merge