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