Merge branch 'master' into antono
Merge branch 'antono' of github.com:antono/prelude into antono