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

Trivial merge