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