Merge branch 'MDL-30494_tokenize_test' of git://github.com/andyjdavis/moodle