Patch contributed by Bruno Santos, resolves bug-report https://bugs.openfoam.org/view.php?id=2585
Resolves bug-report https://bugs.openfoam.org/view.php?id=2438