Merge branch 'MDL-58450_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 31 Mar 2017 08:12:16 +0000 (09:12 +0100)
committerDan Poltawski <dan@moodle.com>
Fri, 31 Mar 2017 08:12:16 +0000 (09:12 +0100)

Trivial merge