Merge branch 'MDL-58217-master' of git://github.com/jleyva/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 14 Mar 2017 04:10:56 +0000 (12:10 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 14 Mar 2017 10:27:22 +0000 (11:27 +0100)

Trivial merge