Merge branch 'MDL-58576-master' of git://github.com/andrewnicols/moodle