Merge branch 'MDL-55922' of https://github.com/mr-russ/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 25 Oct 2016 07:11:43 +0000 (15:11 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 25 Oct 2016 07:11:43 +0000 (15:11 +0800)

Trivial merge