RSS feed should be sent with charset=utf-8 header
Merge pull request #3453 from uniun/patch-1

RSS feed should be sent with charset=utf-8 header
BUG MySQLDatabase performs queries on wrong DB connection when using connection $name != 'default'
Merge pull request #3465 from tractorcow/pulls/3.1/fix-query

BUG MySQLDatabase performs queries on wrong DB connection when using connection $name != default
showqueries output incorrectly shows "ms" instead of "s"
Merge pull request #3466 from halkyon/showqueries_label

showqueries output incorrectly shows "ms" instead of "s"
BUG CSSContentParser fails if CLI tidy doesn't output anything.

In cases where CLI tidy fails to recognise HTML with errors or
unknown HTML5 elements, it doesn't output any content and
CSSContentParser fails.

This adds the --force-output parameter so that it always outputs
the input content, even if it wasn't completely fixed by tidy.

It seems that tidy class in PHP already does this, so this just
fixes the CLI use of tidy in CSSContentParser to be consistent.

This fix can be observed on the HHVM travis builds, as tidy isn't
compiled into HHVM as an extension.
DataList spelling error

Minor spelling error in DataList
Merge pull request #3469 from stevie-mayhew/patch-1

DataList spelling error
Update templates.md

Remove link to page which wasn't continued since 2.4.
Merge pull request #3470 from spekulatius/patch-2

Update templates.md
Merge pull request #3468 from halkyon/tidy_fixes

BUG CSSContentParser fails if CLI tidy doesn't output anything.
Adding ability to change query distinct on DataList and DataQuery
Merge pull request #3467 from halkyon/distinct_orm

Adding ability to change query distinct on DataList and DataQuery
Update PhpUnitWrapper.php & TestRunner.php to recommend PHPUnit installation via Composer rather than PEAR

Using the PEAR Installer to install PHPUnit is no longer supported.  See https://github.com/sebastianbergmann/phpunit/wiki/End-of-Life-for-PEAR-Installation-Method.

Replace PEAR in a comment and die output message with Composer.

Signed-off-by: AntonyThorpe <antony.thorpe@budget12.com>
Merge pull request #3476 from AntonyThorpe/PEAR-PHPUnit

Update PhpUnitWrapper.php & TestRunner.php to recommend PHPUnit installation via Composer
Adding some README badges for downloads, license and stable version.
Fixing broken docs on setting allowed extensions on a FileField

Refers to an invalid variable, and is overriding the entire Upload,
which isn't necessary.
Merge pull request #3478 from halkyon/readme_badges

Adding some README badges for downloads, license and stable version.
Merge pull request #3480 from halkyon/allowed_exts_doc_change

Fixing broken docs on setting allowed extensions on a FileField