Tested in a bulk build by landry@. Lot of feedback from various people on ports@: thanks! OK landry@, sthen@
"This is good, commit." espie@