Merge branch 'MDL-44598_master' of https://github.com/jonof/moodle