Windows Phone 8.1 Support
Merge branch 'windows-phone-8.1'