Merge branch 'MDL-54853-master' of git://github.com/cameron1729/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 9 Jun 2016 01:41:53 +0000 (09:41 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 9 Jun 2016 01:41:53 +0000 (09:41 +0800)

Trivial merge