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