Merge branch 'MDL-26401-39' of git://github.com/lameze/moodle into MOODLE_39_STABLE