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