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