Merge branch 'MDL-55048-master' of git://github.com/danpoltawski/moodle