Merge branch 'MDL-58393-33_filter-order' of https://github.com/roperto/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 17 Apr 2017 09:30:32 +0000 (10:30 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 17 Apr 2017 09:30:32 +0000 (10:30 +0100)

Trivial merge