OUWiki: Filters not applied on export #8631
OUWiki Forumng OUBlog: Update version requires to 2.5 [M2.5] #8640
OUBlog OUWiki: Participation by user: non-editing tutor can see and regrade other group members #8463
OUWiki: Group mode warnings use print_error() incorrectly #8802
OUWiki: editing locked until end edit date added #8880
OUWIKI ensure images in intro field render correctly ISSUE30 #9188
Various: Google Docs portfolio export fails with DB error #9487
OUWiki: Attachments should be included in templates #8768
OUWiki: Copy pages from one wiki to another #8778
Post merge fixup: Replace deprecated check_browser_version.

Needed to be replaced by core_useragent::check_browser_version. This was
giving a warning on every page, because of the occurrence in theme, but
I decided to fix it everywhere.
Fixed get context deprecated functions everywhere after 2.6 merge #9632
OUWiki: Fix known Moodle 2.6 issues [M2.6] #9711
OUwiki: Undefined variable: intro in mod/ouwiki/view.php #9751
Forumng OUWiki: Fix form layout issues [M2.6] #9774
OUWiki: Convert main simple tests to PHP unit #9937
OUWiki: Add unique index on subwikis table #10070
OUWiki: display of File picker [2.6] #10243
Merge pull request #1 from moodleou/master

Upstream