Messy 2.7 parallel commits
Fix typo in manual (#139)
Merge branch 'dev'
Document some forgotten tests
Document some forgotten tests
Merge branch 'dev'
Merge branch 'master' into ms