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