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