Merge branch 'MDL-58220-master-fix1' of http://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 5 Apr 2017 04:56:01 +0000 (12:56 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 5 Apr 2017 04:56:01 +0000 (12:56 +0800)

Trivial merge