Merge branch 'MDL-44454_old_code' of https://github.com/andyjdavis/moodle