Merge branch 'MDL-56979-master-2' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 19 Jun 2017 09:46:09 +0000 (10:46 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 19 Jun 2017 09:46:09 +0000 (10:46 +0100)

Trivial merge