Merge branch 'MDL-61121-master-5' of git://github.com/mihailges/moodle