r9877: Merge from lorikeet-heimdal, to try and fix build failures.