[dali_1.2.48] Merge branch 'devel/master' 85/138985/1
authoradam.b <adam.b@samsung.com>
Fri, 14 Jul 2017 12:30:22 +0000 (13:30 +0100)
committeradam.b <adam.b@samsung.com>
Fri, 14 Jul 2017 12:30:22 +0000 (13:30 +0100)
Change-Id: I3c31aed793ca79db87198c3e0fd6736b48e0137a


Trivial merge