Merge branch 'MDL-56273' of https://github.com/mr-russ/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 31 Oct 2016 06:00:36 +0000 (14:00 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 31 Oct 2016 06:00:36 +0000 (14:00 +0800)

Trivial merge