Merge branch 'MDL-47238_guest' of https://github.com/andyjdavis/moodle