Merge back from develop

Oh jeez, that bug affected WinRT too? Gracious, that commit was bad.