Merge branch 'MDL-55611_master' of git://github.com/markn86/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 6 Apr 2017 05:24:05 +0000 (13:24 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 6 Apr 2017 05:24:05 +0000 (13:24 +0800)

Trivial merge