Merge branch 'V5-6-patches' into V5-7-patches

* V5-6-patches:
  Win32: Visual Studio 2013 build fix