[dali_1.3.50] Merge branch 'devel/master' 60/193260/1
authoradam.b <adam.b@samsung.com>
Fri, 16 Nov 2018 12:22:26 +0000 (12:22 +0000)
committeradam.b <adam.b@samsung.com>
Fri, 16 Nov 2018 12:22:26 +0000 (12:22 +0000)
Change-Id: I90af1a6793b90b19014c0e843cbe410b86d05172


Trivial merge