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