Literally throwing stuff at the wall to see what sticks...
Merge branch 'master' of github.com:concerto/concerto

* 'master' of github.com:concerto/concerto:
  change assert equal statements so that expected values are first