Merge branch 'MDL-60210-master-upgradecheck' of git://github.com/mudrd8mz/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 3 Oct 2017 02:32:15 +0000 (10:32 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 3 Oct 2017 02:32:15 +0000 (10:32 +0800)

Trivial merge