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