Merge remote branch 'origin/acid-burn/bug_629_show_autofs_volumes_as_backuplocation...