Merge branch 'dhowells' (patches from DavidH)