Merge branch 'devel/master' into devel/vulkan devel/vulkan
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 31 May 2018 18:05:08 +0000 (19:05 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 31 May 2018 18:06:49 +0000 (19:06 +0100)
Change-Id: I27b1a0d0103c15153c07f34a8cbf4e26060cdd16


Trivial merge