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