Merge branch 'MDL-29924-master' of git://github.com/FMCorz/moodle