Merge pull request #2962 from octo/utils_mount