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