Merge branch 'hughd-fixes' (patches from Hugh Dickins)