Merge branch 'MDL-69549-310-7' of git://github.com/andrewnicols/moodle into MOODLE_31...