Merge branch 'MDL-57161-master' of git://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 6 Dec 2016 05:06:39 +0000 (13:06 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 6 Dec 2016 05:06:39 +0000 (13:06 +0800)

Trivial merge