Merge commit
Merge branch 'master' of https://github.com/Spacies/AudioPhrasebook
Copied across missing tests