Merge branch 'MDL-35104-master-fix' of https://github.com/cameron1729/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 22 Jun 2016 06:57:09 +0000 (14:57 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 22 Jun 2016 06:57:09 +0000 (14:57 +0800)

Trivial merge