Merge branch 'master' into branch
Merge branch 'branch' of github.com:AnyDSL/thorin into branch