[dali_1.3.20] Merge branch 'devel/master' 32/175932/1
authoradam.b <adam.b@samsung.com>
Fri, 13 Apr 2018 10:50:00 +0000 (11:50 +0100)
committeradam.b <adam.b@samsung.com>
Fri, 13 Apr 2018 10:50:00 +0000 (11:50 +0100)
Change-Id: I254c7b4507228ca086e4e4a528e34e4741378dab


Trivial merge