Adding a more-exhaustive test for ties
Merge branch 'master' into scala-2.11