Merge branch 'wip-MDL-54796-master-v2' of git://github.com/abgreeve/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 25 Jul 2016 09:28:27 +0000 (10:28 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 25 Jul 2016 09:28:27 +0000 (10:28 +0100)

Trivial merge