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