Merge branch 'MDL-70769-master' of https://github.com/sharidas/moodle