Missing directory separators in output of suggested _ss_environment paths
Update cli-script.php

Use DIRECTORY_SEPARATOR for cross platform
BUG: Fix for Cookie expiry timeout being passed as a large number on 64 bit machines
FIX: ConfirmedPasswordField used to expose existing hash
BUG Fixed issue where file upload via the HTML Editor media dialogue would not prompt users to overwrite existing files
Merge pull request #2128 from hafriedlander/fix/hashleak

FIX: ConfirmedPasswordField used to expose existing hash
Merge pull request #2120 from ryanwachtl/patch-1

Missing directory separators in output of suggested _ss_environment paths
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.
Back to 3.1
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
Merge branch '3.1' of https://github.com/silverstripe/silverstripe-framework into restfulserver-improvements