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