Merge branch 'MDL-57084_master' of git://github.com/markn86/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 5 Dec 2016 04:26:20 +0000 (12:26 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 5 Dec 2016 04:26:20 +0000 (12:26 +0800)

Trivial merge