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


Trivial merge