[z1815] Fix build in VS11 Developer Preview

(based on commit 6425bf5)

(based on commit [s1375] - 1f6fc8f)