Merge branch 'MDL-66852-master' of github.com:lucaboesch/moodle