Use a containsInAnyOrder matcher
Now that it compiles, it'd be nice if the tests passed, too.
Remove generic cast
Merge branch 'master' into stage