Merge branch 'CB-8412' of https://github.com/MSOpenTech/cordova-wp8