Merge pull request #677 from micmac1/fs-no-bashisms