Merge branch 'wip-MDL-57511-master' of git://github.com/Beedell/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 23 Jan 2017 15:39:55 +0000 (15:39 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 23 Jan 2017 15:39:55 +0000 (15:39 +0000)

Trivial merge