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


Trivial merge