Merge WP8 branch to master