Merge branch 'jknowles-dev' into dev — check is still unhappy, need to fix depends/suggests perhaps
Merge pull request #2 from malecki/dev

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