Merge 'github/vulkan-cts-1.0-dev' into vulkan-cts-1.0-dev
authorPyry Haulos <phaulos@google.com>
Tue, 9 Aug 2016 19:51:19 +0000 (12:51 -0700)
committerPyry Haulos <phaulos@google.com>
Tue, 9 Aug 2016 19:52:59 +0000 (12:52 -0700)

Trivial merge