Merge branch '2.10.x' of git://github.com/scala/scala
Merge branch 'master' of git://github.com/scala/scala
Merge branch 'master' of git://github.com/scala/scala
Merge branch 'master' of git://github.com/scala/scala
Merge branch 'master' of git://github.com/scala/scala
Merge branch 'master' of git://github.com/scala/scala
Merge branch 'master' of github.com:heathermiller/scala-pickling
Fixes #2 and adds some additional ScalaCheck tests
Re-removing Compat
Fixes default parameter drama with helper method