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