Replaced the previous fix for the official one at https://github.com/OpenFOAM/OpenFOAM-2.2.x/commit/5cc33a23168577c9f91564fe6117f4ec1bde1348
Merge branch 'of21x' into of210