Merge branch master of https://github.com/bbatsov/prelude