[dali_1.2.21] Merge branch 'devel/master' 46/109046/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 6 Jan 2017 14:01:42 +0000 (14:01 +0000)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 6 Jan 2017 14:01:42 +0000 (14:01 +0000)
Change-Id: I1556548a047e3e9af8ece74cfe380d61fb17b803


Trivial merge