fixed compilation issues for mingw64 g++ 4.7
Merge remote-tracking branch 'origin/master' into perlin