Merge branch 'master' of github.com:OpenCFD/OpenFOAM-1.7.x