Merge branch 'MDL-43369-master' of git://github.com/jamiepratt/moodle