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


Trivial merge