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