Merge branch 'MDL-58684-master-fix1' of https://github.com/snake/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 8 May 2017 03:20:39 +0000 (11:20 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 8 May 2017 03:20:39 +0000 (11:20 +0800)

Trivial merge