Version 0.2.1.
Merge branch 'master' into scala-2.11
Towards v0.3 again.
Merge branch 'master' into scala-2.11