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

Trivial merge