[dali_1.2.47] Merge branch 'devel/master' 51/137751/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 7 Jul 2017 10:20:56 +0000 (11:20 +0100)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 7 Jul 2017 10:20:56 +0000 (11:20 +0100)
Change-Id: Ibc186b37c945c5b66bb082338c689035477e4f7a


Trivial merge