move M4.5 to master just to satisfy my obscesive compulsive need to have it there
Merge tag 'M4.5'
Had to make amendments. Was not setting returnNameFormatAsKey early enough. Also was converting group names, which it shouldn't - fixed
Merge remote-tracking branch 'origin/master' into nathan
Merge remote-tracking branch 'origin/paul' into nathan