Merge branch 'w43_MDL-29923_m22_removesearch' of git://github.com/skodak/moodle