Merge branch 'MDL-57009-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 7 Feb 2017 12:32:34 +0000 (12:32 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 7 Feb 2017 12:32:34 +0000 (12:32 +0000)

Trivial merge