Merge branch 'MDL-59255-master' of github.com:lucisgit/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 18 Jul 2017 09:54:05 +0000 (10:54 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 18 Jul 2017 09:54:05 +0000 (10:54 +0100)

Trivial merge