Merge branch 'jknowles-dev' into dev — check is still unhappy, need to f...

...ix depends/suggests perhaps