Fix compile errors on WP8
fix conflict
Merge pull request #7407 from visiblelight/fix_wp8_errors

Fix compile errors on WP8