[dali_1.1.27] Merge branch 'devel/master' 87/63587/1
authorTom Robinson <tom.robinson@samsung.com>
Thu, 24 Mar 2016 15:49:23 +0000 (15:49 +0000)
committerTom Robinson <tom.robinson@samsung.com>
Thu, 24 Mar 2016 15:49:23 +0000 (15:49 +0000)
Change-Id: Ib2f5e1d08667205d4fcb28e5fec42ae439eb7604


Trivial merge