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