Merge branch 'MDL-59954-master' of git://github.com/peterRd/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Wed, 19 Dec 2018 09:51:42 +0000 (10:51 +0100)
committerAdrian Greeve <abgreeve@gmail.com>
Wed, 19 Dec 2018 09:51:42 +0000 (10:51 +0100)

Trivial merge