Giving up on this for a while. No idea.
Merge branch 'master' into mojoshader-cs