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