Merge branch 'autofs' (patches from Ian Kent)