Merge branch 'MDL-56262-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 17 Oct 2016 10:01:27 +0000 (11:01 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 17 Oct 2016 10:01:27 +0000 (11:01 +0100)

Trivial merge