Merge branch 'master' into ff

* master:
  Fixed Windows packaging on Visual Studio 2010 Win XP x32.
  back
  git-svn-id: https://svn.ufz.de/svn/ogs/trunk/sources@10001 3895a583-e809-0410-9bb6-aa9463026377
  PTC has updated w.r.t. EOS
  Squashed commit.
  Squashed commit.