Release 4.0 fixes

[Scott Gray]

Hi All,

I'll be reviewing the last fortnight's trunk commits for merging back to the
release branch tonight, so if anyone knows of any trunk commits that should
be merged it would be great if you could post them here.

Thanks
Scott