Merge branch 'vulkan'
authorJason Ekstrand <jason.ekstrand@intel.com>
Fri, 15 Apr 2016 20:52:34 +0000 (13:52 -0700)
committerJason Ekstrand <jason.ekstrand@intel.com>
Fri, 15 Apr 2016 20:52:34 +0000 (13:52 -0700)

Trivial merge