#13 forgot the piece about devtests
Merge branch 'master' into v2.2