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