Merge remote-tracking branch 'origin/fixes'
Merge branch 'master' of https://github.com/bs2609/fs2