Merge branch 'MDL-59713' of https://github.com/stronk7/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 30 Aug 2017 00:20:09 +0000 (08:20 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 30 Aug 2017 00:20:09 +0000 (08:20 +0800)

Trivial merge