addAll tests & implementation; other tweaks
Merge remote-tracking branch 'origin/master'
overcome bad merge?