6.1 - Fixes to axis merging

AdjustAxis was a bit of a mess...