Merge branch 'MDL-57408-master' of git://github.com/jleyva/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 24 Jan 2017 05:01:45 +0000 (13:01 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 24 Jan 2017 05:01:45 +0000 (13:01 +0800)

Trivial merge