MINOR: Fixed typo
Merge pull request #2124 from CheeseSucker/patch-4

MINOR: Fixed typo
BUG: Fix for Cookie expiry timeout being passed as a large number on 64 bit machines
BUG Fixed issue where file upload via the HTML Editor media dialogue would not prompt users to overwrite existing files
Update simple-contact-form.md
Merge pull request #2129 from tractorcow/3.1-htmleditor-mediaform-fixes

BUG Fixed issue in file upload via the HTML Editor media dialogue
Merge pull request #2127 from silverstripe-rebelalliance/cookietimestamp

BUG: Fix for Cookie expiry timeout being passed as a large number on 64 ...
Add a note on the unit of the Session.timeout.
Merge pull request #2132 from mateusz/note

Add a note on the unit of the Session.timeout.
Updated helplink to 3.1
Merge pull request #2142 from ARNHOE/patch-2

Updated helplink to 3.1
Updated calls to methods instead of firect properties in PaginatedList
Merge pull request #2144 from micmania1/2143-paginatedlist-method-calls

ENHANCEMENT: Updated calls to methods instead of direct properties in PaginatedList
FIX: TestRunner was not cleaning up DB on failure

When a unit test being run by PHPUnit encountered a fatal error,
TestRunner::tearDown was never being called. This resulted in tmpdb schemas
littering the database from failed test runs. This changeset fixes the issue
by registering TestRunner::tearDown as a shutdown function, so that it gets
called even in the event of a PHP Fatal Error.
Merge remote-tracking branch 'origin/3.0' into 3.1

Conflicts:
	docs/en/reference/grid-field.md
API Enforce $allowed_actions in RequestHandler->checkAccessAction()

See discussion at https://groups.google.com/forum/?fromgroups#!topic/silverstripe-dev/Dodomh9QZjk

Fixes an access issue where all public methods on FormField were allowed,
and not checked for $allowed_actions. Before this patch you could e.g.
call FormField->Value() on the first field by using action_Value.

Removes the following assertion because it only worked due to RequestHandlingTest_AllowedControllerExtension
*not* having $allowed_extensions declared: "Actions on magic methods are only accessible if explicitly allowed on the controller."