Merge pull request #1688 from jamesu/dx11_openvr_pr