Deprecate Aggregate and DataObject::getComponentsQuery
Add some docs about admin-side HTML sanitisation
Merge pull request #2208 from hafriedlander/fix/sanitise

Add some docs about admin-side HTML sanitisation
Adding test to prove issue with HTTP Header parsing in RestfulService

I have a header like:
X-BB-Auth: xxxx

and it is being given back to me as X-Bb-Auth - i want to prove the issue and the fix
FIX RestfulService header parsing now accepts non-title case headers
Merge pull request #2212 from dhensby/patch-3

Adding test to prove issue with HTTP Header parsing in RestfulService
Merge pull request #2202 from tractorcow/3.1-aggregate-deprecation

API Deprecate Aggregate and DataObject::getComponentsQuery
Member.lock_out_delay_mins configurable, password security docs
BehatFixtureFactory 5.3.8 compat (wrong usage of is_a())
Merge remote-tracking branch 'origin/3.0' into 3.1
DOCFIX: small typo causing linking error
Merge pull request #2214 from chillu/pulls/password-docs

Member.lock_out_delay_mins, password security docs
Typo
Merge pull request #2220 from jthomerson/pulls/small_doc_fix_1

Small typo causing linking error
Merge pull request #2224 from tractorcow/3.1-foreignkey-typo

Typo
Test allowedExtensions in UploadField, return correct HTTP status
Updated loop/if/with to be more consistent
BUG Prevent clickjacking in CMS and Security controllers (fixes #2215)
Merge pull request #2226 from Brancom/3.1

Updated loop/if/with to be more consistent
FIX preg_replace_callback in emailer was broken

Fixes bug introduced by 9deb11f9a0ee01477af38f2826b2a7583545a0b6
Email has no content
This is what happens when we make commits without testing!