Git commits in Moodle 3.4.1 by sam marshall

commit 0ce4a248881a7c3ece6e3dc5ae7140c9dae5daad
Author: sam marshall <s.marshall@open.ac.uk>
Date:   Fri, 01 Dec 2017 23:14:55 +0800
Tag:    v3.4.1

MDL-60943 core_search: Improve exception for preg_replace errors

commit 70a804d98e6ace343de0b8cef0b9d960d00e6f1d
Author: sam marshall <s.marshall@open.ac.uk>
Date:   Fri, 17 Nov 2017 00:50:08 +0800
Tag:    v3.4.1

MDL-60838 core_search: File upload does not honour timeout