Merge pull request #119 from Alexpux/develop

Apply tune=core2 for 32-bit builds
Fix forgotten changes in zlib-x32-post
Merge branch 'develop'