Merge branch 'wip_MDL-36501_master' of https://github.com/mtpmcdermott/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 12 Jun 2017 14:26:52 +0000 (15:26 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 14 Jun 2017 11:30:39 +0000 (12:30 +0100)

Trivial merge