Merge branch 'davidh' (fixes from David Howells)