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