[dali_1.2.48] Merge branch 'devel/master' 83/138983/1
authoradam.b <adam.b@samsung.com>
Fri, 14 Jul 2017 12:29:59 +0000 (13:29 +0100)
committeradam.b <adam.b@samsung.com>
Fri, 14 Jul 2017 12:29:59 +0000 (13:29 +0100)
Change-Id: I47b0720a5762fd9bf200a85c8c48983db110820a


Trivial merge