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

Trivial merge