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

MINOR: Fixed typo
Update simple-contact-form.md
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