[dali_1.2.38] Merge branch 'devel/master' 96/128096/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 5 May 2017 09:53:13 +0000 (10:53 +0100)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 5 May 2017 09:53:13 +0000 (10:53 +0100)
Change-Id: I361e74d90042ee9f1343b71a6db6eabd871136eb


Trivial merge