multi-way merge of updates done in 6.2,6.2,7.1 to try and reduce differences...

multi-way merge of updates done in 6.2,6.2,7.1 to try and reduce differences (not to transfer patches yet, just to make the diffs less impossible)