[dali_1.1.37] Merge branch 'devel/master' 16/73016/1
authorTom Robinson <tom.robinson@samsung.com>
Fri, 3 Jun 2016 13:33:51 +0000 (14:33 +0100)
committerTom Robinson <tom.robinson@samsung.com>
Fri, 3 Jun 2016 13:33:51 +0000 (14:33 +0100)
Change-Id: I44271445ebbf4723d706414f29518d74c994fce5


Trivial merge