Merge branch 'master' into central-server

Conflicts:
	README.md

Hotfix for haskell#395.

Merge branch 'master' into central-server

Bump version

Bump the version and update the description