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