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

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