Merge branch 'MDL-56051-master' of git://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 10 Nov 2016 03:45:01 +0000 (11:45 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 10 Nov 2016 03:45:01 +0000 (11:45 +0800)

Trivial merge