Merge branch 'MDL-57222_master' of git://github.com/markn86/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 13 Dec 2016 02:25:30 +0000 (10:25 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 13 Dec 2016 02:25:30 +0000 (10:25 +0800)

Trivial merge