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