Merge branch 'MDL-43539-master' of https://github.com/jamiepratt/moodle