Merge branch 'master' of https://github.com/scala/scala-collections-laws

especially if it merges an updated upstream into a topic branch.
Merge branch 'master' of https://github.com/scala/scala-collections-laws
Merge pull request #5 from Ichoran/master

Spurious merges?