Merge branch 'MDL-57962-master' of git://github.com/dpalou/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 20 Feb 2017 11:19:16 +0000 (11:19 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 20 Feb 2017 11:19:16 +0000 (11:19 +0000)

Trivial merge