Merge branch 'MDL-58393-33_filter-order' of https://github.com/roperto/moodle