Merge branch 'devel/master' into devel/vulkan
authorFrancisco Santos <f1.santos@samsung.com>
Tue, 14 Nov 2017 15:29:50 +0000 (15:29 +0000)
committerFrancisco Santos <f1.santos@samsung.com>
Tue, 14 Nov 2017 15:29:50 +0000 (15:29 +0000)

Trivial merge