Merge branch 'MDL-70320-master' of https://github.com/andrewnicols/moodle