Merge branch 'MDL-58749' of git://github.com/stronk7/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 5 May 2017 00:23:27 +0000 (08:23 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 5 May 2017 00:23:27 +0000 (08:23 +0800)

Trivial merge