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