Merge branch 'MDL-58257' of https://github.com/ak4t0sh/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 28 Mar 2017 09:50:57 +0000 (10:50 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 28 Mar 2017 09:50:57 +0000 (10:50 +0100)

Trivial merge