Merge branch 'MDL-26607_search_error' of git://github.com/andyjdavis/moodle