[dali_1.2.6] Merge branch 'devel/master' 38/88338/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 16 Sep 2016 09:56:32 +0000 (10:56 +0100)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 16 Sep 2016 09:56:32 +0000 (10:56 +0100)
Change-Id: I5b296d8836986f2d15c41e48d5a9cb3f5d181bdd


Trivial merge