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