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