all tests pass
Merge branch 'master' of https://github.com/nastysloper/oojs_zoo