Potential fix for WindowsPhone build error
Merge branch 'pr/2377' into angle