[dali_1.2.38] Merge branch 'devel/master' 93/128093/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 5 May 2017 09:52:37 +0000 (10:52 +0100)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 5 May 2017 09:52:37 +0000 (10:52 +0100)
Change-Id: I1bd84ea6d2b9aafe225b47d979e2226436231b6f


Trivial merge