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