Merge branch 'MDL-47371-master-fix' of git://github.com/cameron1729/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 13 Jul 2016 04:07:36 +0000 (12:07 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 13 Jul 2016 04:07:36 +0000 (12:07 +0800)

Trivial merge