Merge branch 'MDL-58836-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 10 May 2017 05:56:42 +0000 (06:56 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 10 May 2017 05:56:42 +0000 (06:56 +0100)

Trivial merge