Merge pull request #561 from cshore/pull-request-fstab-improvements