Merge branch 'wip-MDL-64729-master' of https://github.com/Beedell/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Thu, 21 Feb 2019 11:20:48 +0000 (12:20 +0100)
committerAdrian Greeve <abgreeve@gmail.com>
Thu, 21 Feb 2019 11:20:48 +0000 (12:20 +0100)

Trivial merge