Merge branch 'MDL-56190-master-fix1' of http://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 11 Nov 2016 03:39:48 +0000 (11:39 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 11 Nov 2016 03:39:48 +0000 (11:39 +0800)

Trivial merge