Merge branch 'MDL-55315-master' of https://github.com/mrmark/moodle