Merge branch 'MDL-58567-master-v2' of https://github.com/sammarshallou/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 5 Jun 2017 11:39:47 +0000 (12:39 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 5 Jun 2017 11:39:47 +0000 (12:39 +0100)

Trivial merge