Merge branch 'MDL-57587' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 6 Feb 2017 10:59:26 +0000 (10:59 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 6 Feb 2017 10:59:26 +0000 (10:59 +0000)

Trivial merge