SimpleXML string casting in tests for older PHPUnit
BUG SS has problems handling + in URLs. Filter them out.

+ has a special meaning in the URLs so overall it's a good idea to
strip them out. Otherwise they would need to appear in their ugly url
encoded form "%2B".

Refer: http://open.silverstripe.org/ticket/7929
Allow HTML in FormField->setDescription()
Fix edge case in which uninitialized buttons are being destroyed.

In certain cases, the button may not yet be initialized or may no longer have button properties at the time of removal from the DOM. Without this check, an uncaught exception is thrown.
BUGFIX Ensure  has length before using string index access.
Adding test for SortColumn to SQLQueryTest

Mostly for the benefit of MSSQLDatabase which is having problems
with subselects and alias functions.
Don't complain about pre-replaced YAML fixture relations
Allow recursive includes in i18nTextCollector (fixes #8133)
Merge pull request #1063 from drzax/log-file-formatter-fix

BUGFIX Ensure  has length before using string index access.
Merge pull request #1053 from unclecheese/patch-11

Fix edge case in which uninitialized buttons are being destroyed.
Removed direct sprintf() usage from _t() calls

Parameterized strings are easier to understand,
and more fail-proof, don't fatal out when not enough sprintf() args
BUG Graceful handling of sprintf with too few params in i18n::_t()

Originally discovered as a problem with the 'GridFieldDetailForm.Saved' in nl.yml
Merge remote-tracking branch 'origin/3.0' into 3.1

Conflicts:
	admin/javascript/LeftAndMain.FieldHelp.js
	lang/en.yml
	model/URLSegmentFilter.php
BUG SQLQuery::aggregate() with limit, groupBy and orderBy (fixes #8148)
Allow <button type='submit'> for the benifit of IE<=7
Fixed DateField phpdocs
BUG:removed null FormField value. fixes #8088
Merge pull request #1075 from g4b0/8088-GroupedDropdownField-xhtml-strict-2

BUG:removed null FormField value. fixes #8088