Merge branch 'devel/master' into devel/vulkan
authorFrancisco Santos <f1.santos@samsung.com>
Mon, 5 Jun 2017 16:26:24 +0000 (17:26 +0100)
committerFrancisco Santos <f1.santos@samsung.com>
Mon, 5 Jun 2017 16:26:24 +0000 (17:26 +0100)

Trivial merge