[dali_1.2.36] Merge branch 'devel/master' 48/126448/1
authoradam.b <adam.b@samsung.com>
Fri, 21 Apr 2017 11:30:10 +0000 (12:30 +0100)
committeradam.b <adam.b@samsung.com>
Fri, 21 Apr 2017 11:30:10 +0000 (12:30 +0100)
Change-Id: Ibf74b4a3a70d6744d273463c83fa5ffa3a03c795


Trivial merge