Merge branch 'MDL-59961_file_validation' of https://github.com/mrmark/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 4 Sep 2017 09:08:23 +0000 (11:08 +0200)
committerDavid Monllao <davidm@moodle.com>
Thu, 7 Sep 2017 08:46:57 +0000 (10:46 +0200)

Trivial merge