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