Merge branch 'MDL-58658' of https://github.com/sk-unikent/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 6 Jun 2017 09:00:42 +0000 (10:00 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 6 Jun 2017 09:00:42 +0000 (10:00 +0100)

Trivial merge