reverted to working master at 7bf961c131abedd1ee166ff0a244760b74ef95d6
Merge branch 'master' into group