Fix compilation with Visual Studio 2013.

Refs #4987
Merge branch 'feature/vs2013-4987' into next

Fixes #4987