Merge branch 'MDL-59749-master' of git://github.com/ryanwyllie/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 8 Aug 2017 06:33:43 +0000 (14:33 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 8 Aug 2017 06:33:43 +0000 (14:33 +0800)

Trivial merge