Merge pull request #341 from robert-schmidtke/master

Fixed -o mount option aliases #205
Merge remote-tracking branch 'upstream/master' into fstab-integration