[dali_1.2.13] Merge branch 'devel/master' 70/95770/1
authorTom Robinson <tom.robinson@samsung.com>
Fri, 4 Nov 2016 13:16:39 +0000 (13:16 +0000)
committerTom Robinson <tom.robinson@samsung.com>
Fri, 4 Nov 2016 13:16:39 +0000 (13:16 +0000)
Change-Id: I2a13e4b4094795b2e21ac2504e24eabf1f251275


Trivial merge