Merge branch 'wip-MDL-57464-master' of git://github.com/abgreeve/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 2 Jan 2017 11:16:27 +0000 (11:16 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 2 Jan 2017 11:16:27 +0000 (11:16 +0000)

Trivial merge