[dali_1.3.20] Merge branch 'devel/master' 31/175931/1
authoradam.b <adam.b@samsung.com>
Fri, 13 Apr 2018 10:49:44 +0000 (11:49 +0100)
committeradam.b <adam.b@samsung.com>
Fri, 13 Apr 2018 10:49:44 +0000 (11:49 +0100)
Change-Id: Ia599a81e1b4fd3ed8ff20dab5b684830bd28f33b


Trivial merge