Merge branch 'MDL-56350-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 24 Oct 2016 08:17:52 +0000 (09:17 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 24 Oct 2016 08:17:52 +0000 (09:17 +0100)

Trivial merge