[dali_1.2.47] Merge branch 'devel/master' 52/137752/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 7 Jul 2017 10:21:12 +0000 (11:21 +0100)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 7 Jul 2017 10:21:12 +0000 (11:21 +0100)
Change-Id: I45e09f9a15928fe31b228dd5bf26d949755fac3e


Trivial merge