Merge branch 'MDL-54742-master-integration' of https://github.com/mihailges/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 26 Jul 2018 02:34:15 +0000 (10:34 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 26 Jul 2018 02:34:15 +0000 (10:34 +0800)

Trivial merge