Merge branch 'MDL-57751-master' of https://github.com/xow/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 14 Mar 2017 05:31:43 +0000 (13:31 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 14 Mar 2017 10:27:24 +0000 (11:27 +0100)

Trivial merge