Fix #2326: Workaround before update to VS2013 update 2

This is upstream issue #348525 and #330658