Merge branch 'MDL-56431-filter-fix' of git://github.com/abgreeve/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 24 Nov 2016 09:45:53 +0000 (09:45 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 24 Nov 2016 09:45:53 +0000 (09:45 +0000)

Trivial merge