Merge branch 'MDL-37765-MASTER' of https://github.com/jacac/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 3 Apr 2017 08:13:55 +0000 (09:13 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 3 Apr 2017 08:13:55 +0000 (09:13 +0100)

Trivial merge