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

Trivial merge