Merge branch 'MDL-18592-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 15 Aug 2016 13:27:34 +0000 (14:27 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 15 Aug 2016 13:27:34 +0000 (14:27 +0100)

Trivial merge