Merge branch 'MDL-30811-fix' of git://github.com/andrewnicols/moodle