Merge /u/hjasak/foam-extend-3.2/ branch bugfix/sixDOF into master