Merge branch 'MDL-58490-master-fix' of https://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 21 Apr 2017 02:39:41 +0000 (10:39 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 21 Apr 2017 02:39:41 +0000 (10:39 +0800)

Trivial merge