Towards 0.3.
Merge branch 'master' into scala-2.11