Merge branch 'MDL-58514-master' of git://github.com/cameron1729/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 4 May 2017 00:49:48 +0000 (08:49 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 4 May 2017 00:49:48 +0000 (08:49 +0800)

Trivial merge