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