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


Trivial merge