Merge branch 'MDL-55548_master-fix' of https://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 13 Jun 2017 13:37:55 +0000 (14:37 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 14 Jun 2017 11:36:38 +0000 (12:36 +0100)

Trivial merge