Merge branch 'MDL-58499-master' of git://github.com/barbararamiro/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 17 Apr 2017 10:23:52 +0000 (11:23 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 17 Apr 2017 10:23:52 +0000 (11:23 +0100)

Trivial merge