Merge branch 'MDL-57677-master-usermodified' of git://github.com/mudrd8mz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 23 Jan 2017 09:48:11 +0000 (09:48 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 23 Jan 2017 09:48:11 +0000 (09:48 +0000)

Trivial merge