[dali_1.1.37] Merge branch 'devel/master' 18/73018/1
authorTom Robinson <tom.robinson@samsung.com>
Fri, 3 Jun 2016 13:34:07 +0000 (14:34 +0100)
committerTom Robinson <tom.robinson@samsung.com>
Fri, 3 Jun 2016 13:34:07 +0000 (14:34 +0100)
Change-Id: I2d15962a357f586f63f5a8decc6e996bf8a7487a


Trivial merge