Merge branch 'MDL-59700-master' of git://github.com/cameron1729/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 8 Aug 2017 02:12:35 +0000 (10:12 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 8 Aug 2017 02:12:35 +0000 (10:12 +0800)

Trivial merge