Merge branch 'MDL-55740-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 3 Oct 2016 10:16:09 +0000 (11:16 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 3 Oct 2016 10:16:09 +0000 (11:16 +0100)

Trivial merge