Merge branch 'MDL-54794_master' of https://github.com/dg711/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Jul 2016 09:52:56 +0000 (10:52 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Jul 2016 09:52:56 +0000 (10:52 +0100)

Trivial merge