Merge pull request #2245 from Ansuel/fstab