Merge pull request #5112 from wigyori/for-15.05-sshfs