Merge branch 'steve-lunarg-intrinsic-promotion'
authorJohn Kessenich <cepheus@frii.com>
Sat, 3 Dec 2016 20:29:46 +0000 (13:29 -0700)
committerJohn Kessenich <cepheus@frii.com>
Sat, 3 Dec 2016 20:29:46 +0000 (13:29 -0700)

Trivial merge