Merge branch 'MDL-57410-master' of git://github.com/jleyva/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 31 Jan 2017 01:00:34 +0000 (09:00 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 31 Jan 2017 01:00:34 +0000 (09:00 +0800)

Trivial merge