Merge branch 'MDL-58904' of git://github.com/stronk7/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 12 May 2017 02:22:19 +0000 (10:22 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 12 May 2017 02:22:19 +0000 (10:22 +0800)

Trivial merge