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