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