[dali_1.2.9] Merge branch 'devel/master' 59/91459/1
authorFerran Sole <ferran.sole@samsung.com>
Fri, 7 Oct 2016 15:33:42 +0000 (16:33 +0100)
committerFerran Sole <ferran.sole@samsung.com>
Fri, 7 Oct 2016 15:33:42 +0000 (16:33 +0100)
Change-Id: Ic8669fdebe28c91e0cb70a86d471b02dee5a658f


Trivial merge