Merge branch 'devel/master' into devel/new_vr 23/92623/1 devel/new_vr
authorTom Robinson <tom.robinson@samsung.com>
Mon, 17 Oct 2016 15:11:02 +0000 (16:11 +0100)
committerTom Robinson <tom.robinson@samsung.com>
Mon, 17 Oct 2016 15:13:04 +0000 (16:13 +0100)
Change-Id: I986b0d645926ca98da916e6480865769fbe01d64


Trivial merge