[dali_1.1.19] Merge branch 'devel/master' 47/58347/1
authorTom Robinson <tom.robinson@samsung.com>
Fri, 29 Jan 2016 11:34:08 +0000 (11:34 +0000)
committerTom Robinson <tom.robinson@samsung.com>
Fri, 29 Jan 2016 11:34:08 +0000 (11:34 +0000)
Change-Id: I0a2c6c568f3d4ef02f72e078ea5d6771dcb9c394


Trivial merge