oops, fix a few failing tests
Merge remote-tracking branch 'origin/master' into scala-2.10