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


Trivial merge