less test clutter in output
Merge remote-tracking branch 'origin/master' into p2