Merge branch 'MDL-51759-29-2' of git://github.com/andrewnicols/moodle into MOODLE_29_...