Merge branch 'MDL-54722-master' of git://github.com/cameron1729/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 1 Jun 2016 04:24:14 +0000 (12:24 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 1 Jun 2016 04:24:14 +0000 (12:24 +0800)

Trivial merge