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