Merge branch 'MDL-59907' of git://github.com/stronk7/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 28 Aug 2017 00:25:20 +0000 (08:25 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 28 Aug 2017 00:25:20 +0000 (08:25 +0800)

Trivial merge