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


Trivial merge