Merge branch 'marky_working'
authorMark Young <marky@lunarg.com>
Mon, 1 Feb 2016 18:44:53 +0000 (11:44 -0700)
committerMark Young <marky@lunarg.com>
Mon, 1 Feb 2016 18:44:53 +0000 (11:44 -0700)

Trivial merge