Another attempt to resolve Maven Central issues.
Merge branch 'master' into scala-2.10.x