Merge branch 'MDL-57281-master-fix' of https://github.com/andrewnicols/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 23 Aug 2018 07:47:28 +0000 (15:47 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 23 Aug 2018 07:47:28 +0000 (15:47 +0800)

Trivial merge