Proposed Windows Phone 8.1 fix
Merge branch 'windows-phone-81-fix'