Merge branch 'MDL-56081-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 18 Oct 2016 10:24:36 +0000 (11:24 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 18 Oct 2016 10:24:36 +0000 (11:24 +0100)

Trivial merge