Merge branch 'MDL-58637_master' of git://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 20 Apr 2017 06:27:56 +0000 (07:27 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 20 Apr 2017 06:27:56 +0000 (07:27 +0100)

Trivial merge