Merge branch 'mdl57668-master' of https://github.com/tlock/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 23 Jan 2017 12:05:32 +0000 (12:05 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 23 Jan 2017 12:05:32 +0000 (12:05 +0000)

Trivial merge