Merge branch 'MDL-58536-master' of git://github.com/ryanwyllie/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 19 Apr 2017 05:50:28 +0000 (13:50 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 19 Apr 2017 05:50:28 +0000 (13:50 +0800)

Trivial merge