Merge branch 'MDL-58160' of git://github.com/aolley/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 28 Mar 2017 10:34:33 +0000 (11:34 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 28 Mar 2017 10:34:33 +0000 (11:34 +0100)

Trivial merge