Merge branch 'MDL-58220-master-fix2' of http://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 5 Apr 2017 06:43:13 +0000 (14:43 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 5 Apr 2017 06:43:13 +0000 (14:43 +0800)

Trivial merge