Merge branch 'MDL-61951-master' of git://github.com/sarjona/moodle