Merge branch 'MDL-56273' of https://github.com/mr-russ/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 1 Nov 2016 02:55:23 +0000 (10:55 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 1 Nov 2016 02:55:23 +0000 (10:55 +0800)

Trivial merge