Merge branch 'MDL-53169' of https://github.com/stronk7/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 21 Sep 2017 18:03:55 +0000 (19:03 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 21 Sep 2017 18:03:55 +0000 (19:03 +0100)

Trivial merge