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


Trivial merge