Merge branch 'MDL-62309-master-optionalpolicies' of git://github.com/mudrd8mz/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 22 Oct 2018 14:28:41 +0000 (16:28 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 22 Oct 2018 14:28:41 +0000 (16:28 +0200)

Trivial merge