Merge branch 'MDL-46322' of https://github.com/stronk7/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 13 Jun 2017 08:15:55 +0000 (09:15 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 14 Jun 2017 11:32:01 +0000 (12:32 +0100)

Trivial merge