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