Merge branch 'MDL-58776_master-fix' of https://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 17 May 2017 11:11:56 +0000 (12:11 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 17 May 2017 11:11:56 +0000 (12:11 +0100)

Trivial merge