Merge branch 'MDL-57259-master' of git://github.com/ryanwyllie/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 2 Aug 2017 05:39:23 +0000 (13:39 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 2 Aug 2017 05:39:23 +0000 (13:39 +0800)

Trivial merge