diff --git a/admin/code/CMSMenu.php b/admin/code/CMSMenu.php
index 36d7826a3..d3ba14ea2 100644
--- a/admin/code/CMSMenu.php
+++ b/admin/code/CMSMenu.php
@@ -323,4 +323,3 @@ class CMSMenu extends Object implements IteratorAggregate, i18nEntityProvider
 		return $entities;
 	}
 }
-?>
\ No newline at end of file
diff --git a/admin/code/CMSMenuItem.php b/admin/code/CMSMenuItem.php
index 4a6cd6549..97cd75778 100644
--- a/admin/code/CMSMenuItem.php
+++ b/admin/code/CMSMenuItem.php
@@ -47,4 +47,3 @@ class CMSMenuItem extends Object
 	}
 	
 }
-?>
\ No newline at end of file
diff --git a/admin/code/GroupImportForm.php b/admin/code/GroupImportForm.php
index 01e33264b..985326816 100644
--- a/admin/code/GroupImportForm.php
+++ b/admin/code/GroupImportForm.php
@@ -87,4 +87,3 @@ class GroupImportForm extends Form {
 	}
 	
 }
-?>
\ No newline at end of file
diff --git a/admin/code/LeftAndMain.php b/admin/code/LeftAndMain.php
index d175ac8a8..85d622f5c 100644
--- a/admin/code/LeftAndMain.php
+++ b/admin/code/LeftAndMain.php
@@ -1345,4 +1345,4 @@ class LeftAndMainMarkingFilter {
 		return array_key_exists((int) $id, $this->ids) ? $this->ids[$id] : false;
 	}
 }
-?>
+
diff --git a/admin/code/MemberImportForm.php b/admin/code/MemberImportForm.php
index b84397df4..731c48aa5 100644
--- a/admin/code/MemberImportForm.php
+++ b/admin/code/MemberImportForm.php
@@ -105,4 +105,3 @@ class MemberImportForm extends Form {
 		return $this->group;
 	}
 }
-?>
\ No newline at end of file
diff --git a/admin/code/MemberTableField.php b/admin/code/MemberTableField.php
index 5fbfbbebe..9309eacc4 100644
--- a/admin/code/MemberTableField.php
+++ b/admin/code/MemberTableField.php
@@ -368,4 +368,3 @@ class MemberTableField_Item extends ComplexTableField_Item {
 	}
 }
 
-?>
\ No newline at end of file
diff --git a/admin/code/ModelAdmin.php b/admin/code/ModelAdmin.php
index 795041486..82bbba7a0 100644
--- a/admin/code/ModelAdmin.php
+++ b/admin/code/ModelAdmin.php
@@ -1054,4 +1054,3 @@ class ModelAdmin_RecordController extends Controller {
 	
 }
 
-?>
\ No newline at end of file
diff --git a/admin/code/SecurityAdmin.php b/admin/code/SecurityAdmin.php
index b7332a8bc..a92335f67 100755
--- a/admin/code/SecurityAdmin.php
+++ b/admin/code/SecurityAdmin.php
@@ -379,4 +379,4 @@ class SecurityAdmin_DeleteBatchAction extends CMSBatchAction {
 		return Convert::raw2json($status);
 	}
 }
-?>
+
diff --git a/admin/tests/SecurityAdminTest.php b/admin/tests/SecurityAdminTest.php
index 238a9b32f..387ccc16e 100644
--- a/admin/tests/SecurityAdminTest.php
+++ b/admin/tests/SecurityAdminTest.php
@@ -90,4 +90,3 @@ class SecurityAdminTest extends FunctionalTest {
 	}
 }
 
-?>
\ No newline at end of file
diff --git a/api/FormEncodedDataFormatter.php b/api/FormEncodedDataFormatter.php
index 2a9d9edfe..f9ddb847f 100644
--- a/api/FormEncodedDataFormatter.php
+++ b/api/FormEncodedDataFormatter.php
@@ -40,4 +40,3 @@ class FormEncodedDataFormatter extends XMLDataFormatter {
 	}
 	
 }
-?>
\ No newline at end of file
diff --git a/api/JSONDataFormatter.php b/api/JSONDataFormatter.php
index 6ef831ab4..d8bafe478 100644
--- a/api/JSONDataFormatter.php
+++ b/api/JSONDataFormatter.php
@@ -138,4 +138,3 @@ class JSONDataFormatter extends DataFormatter {
 	}
 
 }
-?>
\ No newline at end of file
diff --git a/api/RSSFeed.php b/api/RSSFeed.php
index bccff5a0e..bfc3a2a3e 100644
--- a/api/RSSFeed.php
+++ b/api/RSSFeed.php
@@ -317,4 +317,3 @@ class RSSFeed_Entry extends ViewableData {
 		else user_error($this->failover->class . " object has either an AbsoluteLink nor a Link method.  Can't put a link in the RSS feed", E_USER_WARNING);
 	}
 }
-?>
\ No newline at end of file
diff --git a/api/RestfulService.php b/api/RestfulService.php
index 881a9270c..db67133cf 100644
--- a/api/RestfulService.php
+++ b/api/RestfulService.php
@@ -465,4 +465,4 @@ class RestfulService_Response extends SS_HTTPResponse {
 	}
 }
 
-?>
+
diff --git a/api/SOAPModelAccess.php b/api/SOAPModelAccess.php
index a8ebdbfc4..424637799 100644
--- a/api/SOAPModelAccess.php
+++ b/api/SOAPModelAccess.php
@@ -247,4 +247,3 @@ class SOAPModelAccess extends SapphireSoapServer {
 	}
 }
 
-?>
\ No newline at end of file
diff --git a/api/SapphireSoapServer.php b/api/SapphireSoapServer.php
index 8bb6265b3..441d9e653 100644
--- a/api/SapphireSoapServer.php
+++ b/api/SapphireSoapServer.php
@@ -100,4 +100,4 @@ class SapphireSoapServer extends Controller {
 	}
 }
 
-?>
+
diff --git a/api/VersionedRestfulServer.php b/api/VersionedRestfulServer.php
index a2fbf6584..cfd7a414d 100644
--- a/api/VersionedRestfulServer.php
+++ b/api/VersionedRestfulServer.php
@@ -20,4 +20,4 @@ class VersionedRestfulServer extends Controller {
 	}
 }
 
-?>
+
diff --git a/cli-script.php b/cli-script.php
index a65baaa90..bc74897f1 100755
--- a/cli-script.php
+++ b/cli-script.php
@@ -83,4 +83,4 @@ $_SERVER['REQUEST_URI'] = BASE_URL . '/' . $url;
 DataModel::set_inst(new DataModel());
 Director::direct($url, DataModel::inst());
 
-?>
+
diff --git a/control/Controller.php b/control/Controller.php
index 1c1975347..ac1af911b 100644
--- a/control/Controller.php
+++ b/control/Controller.php
@@ -568,4 +568,4 @@ class Controller extends RequestHandler {
 	}
 }
 
-?>
+
diff --git a/control/FormResponse.php b/control/FormResponse.php
index b6a62569f..80e80e84a 100644
--- a/control/FormResponse.php
+++ b/control/FormResponse.php
@@ -270,4 +270,4 @@ class FormResponse {
 		return $js;
 	}
 }
-?>
+
diff --git a/control/HTTP.php b/control/HTTP.php
index 0ce1a49b9..0a2f08bf7 100644
--- a/control/HTTP.php
+++ b/control/HTTP.php
@@ -400,4 +400,4 @@ class HTTP {
 
 }
 
-?>
+
diff --git a/core/ClassInfo.php b/core/ClassInfo.php
index 8dec66979..2797650e7 100644
--- a/core/ClassInfo.php
+++ b/core/ClassInfo.php
@@ -233,4 +233,4 @@ class ClassInfo {
 	}
 	
 }
-?>
+
diff --git a/core/Diff.php b/core/Diff.php
index c5b4a81ce..f59da6705 100644
--- a/core/Diff.php
+++ b/core/Diff.php
@@ -879,4 +879,4 @@ extends Diff
     }
 }
 
-?>
+
diff --git a/core/Extension.php b/core/Extension.php
index cb4faa6cb..2cbd4f264 100644
--- a/core/Extension.php
+++ b/core/Extension.php
@@ -88,4 +88,3 @@ abstract class Extension {
 	
 }
 
-?>
\ No newline at end of file
diff --git a/dev/BuildTask.php b/dev/BuildTask.php
index 7dde72228..2d8d57b39 100644
--- a/dev/BuildTask.php
+++ b/dev/BuildTask.php
@@ -57,4 +57,4 @@ abstract class BuildTask extends Object {
 	
 }
 
-?>
+
diff --git a/dev/BulkLoader.php b/dev/BulkLoader.php
index 1b6fa1e93..2b53188ba 100644
--- a/dev/BulkLoader.php
+++ b/dev/BulkLoader.php
@@ -410,4 +410,3 @@ class BulkLoader_Result extends Object {
 	}
    
 }
-?>
\ No newline at end of file
diff --git a/dev/CSVParser.php b/dev/CSVParser.php
index 4a8c387d2..c20ce4290 100644
--- a/dev/CSVParser.php
+++ b/dev/CSVParser.php
@@ -234,4 +234,3 @@ class CSVParser extends Object implements Iterator {
 
 }
 
-?>
\ No newline at end of file
diff --git a/dev/Cli.php b/dev/Cli.php
index 2cb05eb23..5219798ba 100644
--- a/dev/Cli.php
+++ b/dev/Cli.php
@@ -81,4 +81,3 @@ class SS_Cli extends Object {
 	}
 }
 
-?>
\ No newline at end of file
diff --git a/dev/CliDebugView.php b/dev/CliDebugView.php
index 568f7135c..d43f7def8 100644
--- a/dev/CliDebugView.php
+++ b/dev/CliDebugView.php
@@ -69,4 +69,3 @@ class CliDebugView extends DebugView {
 	
 }
 
-?>
\ No newline at end of file
diff --git a/dev/CsvBulkLoader.php b/dev/CsvBulkLoader.php
index c0e1552ba..09c17c6f2 100644
--- a/dev/CsvBulkLoader.php
+++ b/dev/CsvBulkLoader.php
@@ -189,4 +189,3 @@ class CsvBulkLoader extends BulkLoader {
 	}
 	
 }
-?>
\ No newline at end of file
diff --git a/dev/DebugView.php b/dev/DebugView.php
index fea85a309..6eac9dabe 100644
--- a/dev/DebugView.php
+++ b/dev/DebugView.php
@@ -169,4 +169,3 @@ class DebugView extends Object {
 	}
 }
 
-?>
\ No newline at end of file
diff --git a/dev/InstallerTest.php b/dev/InstallerTest.php
index d89fb3e52..13f280968 100644
--- a/dev/InstallerTest.php
+++ b/dev/InstallerTest.php
@@ -15,4 +15,3 @@ class InstallerTest extends Controller {
 	}
 }
 
-?>
\ No newline at end of file
diff --git a/dev/MigrationTask.php b/dev/MigrationTask.php
index ff3bd861e..0d5ab750b 100644
--- a/dev/MigrationTask.php
+++ b/dev/MigrationTask.php
@@ -67,4 +67,3 @@ class MigrationTask extends BuildTask {
 	
 }
 
-?>
\ No newline at end of file
diff --git a/dev/ModelViewer.php b/dev/ModelViewer.php
index 74dbebba7..d62ef85fc 100644
--- a/dev/ModelViewer.php
+++ b/dev/ModelViewer.php
@@ -211,4 +211,3 @@ class ModelViewer_Relation extends ViewableData {
 	
 }
 
-?>
\ No newline at end of file
diff --git a/dev/Profiler.php b/dev/Profiler.php
index c1fc4297c..47cfb8f38 100644
--- a/dev/Profiler.php
+++ b/dev/Profiler.php
@@ -232,4 +232,3 @@ class Profiler {
             $this->running[$name] += $this->elapsedTime($name);
     }
 }
-?>
\ No newline at end of file
diff --git a/dev/SapphireREPL.php b/dev/SapphireREPL.php
index 4b5b520cb..7d761f99d 100644
--- a/dev/SapphireREPL.php
+++ b/dev/SapphireREPL.php
@@ -85,4 +85,3 @@ class SapphireREPL extends Controller {
 	}
 }
 
-?>
\ No newline at end of file
diff --git a/dev/SapphireTest.php b/dev/SapphireTest.php
index 5d3c54e5a..34381a1bb 100644
--- a/dev/SapphireTest.php
+++ b/dev/SapphireTest.php
@@ -860,4 +860,4 @@ class SapphireTest extends PHPUnit_Framework_TestCase {
 	protected $cache_generatedMembers = array();
 }
 
-?>
+
diff --git a/dev/SapphireTestReporter.php b/dev/SapphireTestReporter.php
index f86722b45..4785fcfbb 100644
--- a/dev/SapphireTestReporter.php
+++ b/dev/SapphireTestReporter.php
@@ -305,4 +305,3 @@ class SapphireTestReporter implements PHPUnit_Framework_TestListener {
 	
 }
 
-?>
\ No newline at end of file
diff --git a/dev/SapphireTestSuite.php b/dev/SapphireTestSuite.php
index fe5ff40de..7c614c841 100644
--- a/dev/SapphireTestSuite.php
+++ b/dev/SapphireTestSuite.php
@@ -21,4 +21,3 @@ class SapphireTestSuite extends PHPUnit_Framework_TestSuite {
 		}
 	}
 }
-?>
\ No newline at end of file
diff --git a/dev/TaskRunner.php b/dev/TaskRunner.php
index 4b270d555..1ff0f15ba 100644
--- a/dev/TaskRunner.php
+++ b/dev/TaskRunner.php
@@ -100,4 +100,4 @@ class TaskRunner extends Controller {
 	
 }
 
-?>
+
diff --git a/dev/TestOnly.php b/dev/TestOnly.php
index a3cee63a9..d30a57780 100644
--- a/dev/TestOnly.php
+++ b/dev/TestOnly.php
@@ -8,4 +8,3 @@ interface TestOnly {
 
 }
 
-?>
\ No newline at end of file
diff --git a/email/Email.php b/email/Email.php
index def4b9cab..aab92c8cf 100644
--- a/email/Email.php
+++ b/email/Email.php
@@ -766,4 +766,4 @@ class Email_BounceRecord extends DataObject {
 	}
 }
 
-?>
+
diff --git a/filesystem/Filesystem.php b/filesystem/Filesystem.php
index eaf0d94fe..edd012291 100644
--- a/filesystem/Filesystem.php
+++ b/filesystem/Filesystem.php
@@ -171,4 +171,3 @@ class Filesystem extends Object {
 	
 }
 
-?>
\ No newline at end of file
diff --git a/filesystem/GD.php b/filesystem/GD.php
index b79572499..667265096 100644
--- a/filesystem/GD.php
+++ b/filesystem/GD.php
@@ -408,4 +408,3 @@ class GD extends Object {
 	
 }
 
-?>
\ No newline at end of file
diff --git a/forms/AjaxUniqueTextField.php b/forms/AjaxUniqueTextField.php
index be8fd413b..ece33ce03 100644
--- a/forms/AjaxUniqueTextField.php
+++ b/forms/AjaxUniqueTextField.php
@@ -124,4 +124,3 @@ JS;
 		return true; 
 	}
 }
-?>
\ No newline at end of file
diff --git a/forms/ComplexTableField.php b/forms/ComplexTableField.php
index 3a14a9298..13b8c560b 100644
--- a/forms/ComplexTableField.php
+++ b/forms/ComplexTableField.php
@@ -876,4 +876,4 @@ class ComplexTableField_Popup extends Form {
 	}
 }
 
-?>
+
diff --git a/forms/CompositeField.php b/forms/CompositeField.php
index 75e9f388a..f62ec4f77 100644
--- a/forms/CompositeField.php
+++ b/forms/CompositeField.php
@@ -330,4 +330,3 @@ class CompositeField extends FormField {
 	}
 }
 
-?>
\ No newline at end of file
diff --git a/forms/CurrencyField.php b/forms/CurrencyField.php
index e8df11610..e95099122 100644
--- a/forms/CurrencyField.php
+++ b/forms/CurrencyField.php
@@ -143,4 +143,3 @@ class CurrencyField_Disabled extends CurrencyField{
 	}
 }
 
-?>
\ No newline at end of file
diff --git a/forms/CustomRequiredFields.php b/forms/CustomRequiredFields.php
index 971565e5e..77e3af5ce 100644
--- a/forms/CustomRequiredFields.php
+++ b/forms/CustomRequiredFields.php
@@ -146,4 +146,3 @@ class CustomRequiredFields extends RequiredFields{
 	}
 }
 
-?>
\ No newline at end of file
diff --git a/forms/DateField.php b/forms/DateField.php
index 0557fba08..6e4e7781b 100644
--- a/forms/DateField.php
+++ b/forms/DateField.php
@@ -704,4 +704,4 @@ class DateField_View_JQuery {
 		return preg_replace($patterns, $replacements, $format);
 	}
 }
-?>
+
diff --git a/forms/DatetimeField.php b/forms/DatetimeField.php
index 14cdb9d90..1168354da 100644
--- a/forms/DatetimeField.php
+++ b/forms/DatetimeField.php
@@ -313,4 +313,3 @@ class DatetimeField_Readonly extends DatetimeField {
 		return true;	
 	}
 }
-?>
\ No newline at end of file
diff --git a/forms/DisabledTransformation.php b/forms/DisabledTransformation.php
index c34525bf6..b3d33d61e 100644
--- a/forms/DisabledTransformation.php
+++ b/forms/DisabledTransformation.php
@@ -10,4 +10,3 @@ class DisabledTransformation extends FormTransformation {
 	}
 }
 
-?>
\ No newline at end of file
diff --git a/forms/FieldGroup.php b/forms/FieldGroup.php
index 2c0dee4c0..245075816 100644
--- a/forms/FieldGroup.php
+++ b/forms/FieldGroup.php
@@ -182,4 +182,3 @@ HTML;
 	
 }
 
-?>
\ No newline at end of file
diff --git a/forms/FormTransformation.php b/forms/FormTransformation.php
index a668374f1..4801afe12 100644
--- a/forms/FormTransformation.php
+++ b/forms/FormTransformation.php
@@ -51,4 +51,3 @@ class FormTransformation extends Object {
 	}
 }
 
-?>
\ No newline at end of file
diff --git a/forms/GroupedDropdownField.php b/forms/GroupedDropdownField.php
index 72703de22..3708cf277 100644
--- a/forms/GroupedDropdownField.php
+++ b/forms/GroupedDropdownField.php
@@ -59,4 +59,3 @@ class GroupedDropdownField extends DropdownField {
 	}
 }
 
-?>
\ No newline at end of file
diff --git a/forms/HasManyComplexTableField.php b/forms/HasManyComplexTableField.php
index 724204102..acc651500 100644
--- a/forms/HasManyComplexTableField.php
+++ b/forms/HasManyComplexTableField.php
@@ -158,4 +158,4 @@ class HasManyComplexTableField_Item extends ComplexTableField_Item {
 	}
 }
 
-?>
+
diff --git a/forms/HasOneComplexTableField.php b/forms/HasOneComplexTableField.php
index fc23b5535..8e2164692 100644
--- a/forms/HasOneComplexTableField.php
+++ b/forms/HasOneComplexTableField.php
@@ -100,4 +100,3 @@ class HasOneComplexTableField_Item extends ComplexTableField_Item {
 	}
 }
 
-?>
\ No newline at end of file
diff --git a/forms/InlineFormAction.php b/forms/InlineFormAction.php
index 8d7dea706..f79758fbb 100644
--- a/forms/InlineFormAction.php
+++ b/forms/InlineFormAction.php
@@ -67,4 +67,3 @@ class InlineFormAction_ReadOnly extends FormField {
 		return false; 
 	}
 }
-?>
\ No newline at end of file
diff --git a/forms/ListboxField.php b/forms/ListboxField.php
index 7b835cb04..ae844e039 100644
--- a/forms/ListboxField.php
+++ b/forms/ListboxField.php
@@ -183,4 +183,3 @@ class ListboxField extends DropdownField {
 	}
 	
 }
-?>
\ No newline at end of file
diff --git a/forms/LookupField.php b/forms/LookupField.php
index d9c9a563d..6d06f27a3 100644
--- a/forms/LookupField.php
+++ b/forms/LookupField.php
@@ -68,4 +68,3 @@ class LookupField extends DropdownField {
 	}
 }
 
-?>
\ No newline at end of file
diff --git a/forms/ManyManyComplexTableField.php b/forms/ManyManyComplexTableField.php
index 0edeedbf4..ecf295592 100644
--- a/forms/ManyManyComplexTableField.php
+++ b/forms/ManyManyComplexTableField.php
@@ -103,4 +103,4 @@ class ManyManyComplexTableField_Item extends ComplexTableField_Item {
 	}
 }
 
-?>
+
diff --git a/forms/MoneyField.php b/forms/MoneyField.php
index 091f2c3c6..2fbe9fde7 100644
--- a/forms/MoneyField.php
+++ b/forms/MoneyField.php
@@ -165,4 +165,3 @@ class MoneyField extends FormField {
 		return $this->_locale;
 	}
 }
-?>
\ No newline at end of file
diff --git a/forms/NumericField.php b/forms/NumericField.php
index 57e97c05a..eeef22501 100644
--- a/forms/NumericField.php
+++ b/forms/NumericField.php
@@ -73,4 +73,3 @@ JS;
 		return (is_numeric($this->value)) ? $this->value : 0;
 	}
 }
-?>
\ No newline at end of file
diff --git a/forms/PasswordField.php b/forms/PasswordField.php
index a76779df9..44f8886b8 100644
--- a/forms/PasswordField.php
+++ b/forms/PasswordField.php
@@ -41,4 +41,3 @@ class PasswordField extends TextField {
 	}
 }
 
-?>
\ No newline at end of file
diff --git a/forms/PhoneNumberField.php b/forms/PhoneNumberField.php
index 9e1493582..135d23644 100644
--- a/forms/PhoneNumberField.php
+++ b/forms/PhoneNumberField.php
@@ -191,4 +191,3 @@ JS;
 		return true;
 	}
 }
-?>
\ No newline at end of file
diff --git a/forms/PrintableTransformation.php b/forms/PrintableTransformation.php
index 69305f971..3e1739176 100644
--- a/forms/PrintableTransformation.php
+++ b/forms/PrintableTransformation.php
@@ -40,4 +40,3 @@ class PrintableTransformation_TabSet extends TabSet {
 	
 }
 
-?>
\ No newline at end of file
diff --git a/forms/ReadonlyTransformation.php b/forms/ReadonlyTransformation.php
index 98f325c55..cc06a7686 100644
--- a/forms/ReadonlyTransformation.php
+++ b/forms/ReadonlyTransformation.php
@@ -9,4 +9,3 @@ class ReadonlyTransformation extends FormTransformation {
 	// methods on the individual FormField objects.	
 }
 
-?>
\ No newline at end of file
diff --git a/forms/RequiredFields.php b/forms/RequiredFields.php
index a22ec73ae..990563469 100644
--- a/forms/RequiredFields.php
+++ b/forms/RequiredFields.php
@@ -173,4 +173,4 @@ JS;
 	}
 }
 
-?>
+
diff --git a/forms/ScaffoldingComplexTableField.php b/forms/ScaffoldingComplexTableField.php
index 24e20a231..67aa32318 100644
--- a/forms/ScaffoldingComplexTableField.php
+++ b/forms/ScaffoldingComplexTableField.php
@@ -91,4 +91,3 @@ class ScaffoldingComplexTableField_Popup extends ComplexTableField_Popup {
 	}
 
 }
-?>
\ No newline at end of file
diff --git a/forms/SelectionGroup.php b/forms/SelectionGroup.php
index ee51fa197..b742d5d3b 100644
--- a/forms/SelectionGroup.php
+++ b/forms/SelectionGroup.php
@@ -94,4 +94,3 @@ class SelectionGroup extends CompositeField {
 	}
 }
 
-?>
\ No newline at end of file
diff --git a/forms/Tab.php b/forms/Tab.php
index 58f674193..2c76c03bd 100644
--- a/forms/Tab.php
+++ b/forms/Tab.php
@@ -68,4 +68,3 @@ class Tab extends CompositeField {
 	}
 }
 
-?>
\ No newline at end of file
diff --git a/forms/TableField.php b/forms/TableField.php
index 4797f3c45..71ead5db4 100644
--- a/forms/TableField.php
+++ b/forms/TableField.php
@@ -753,4 +753,3 @@ class TableField_Item extends TableListField_Item {
 	
 }
 
-?>
\ No newline at end of file
diff --git a/forms/TableListField.php b/forms/TableListField.php
index 7ea7f92d8..84119cfa5 100644
--- a/forms/TableListField.php
+++ b/forms/TableListField.php
@@ -1574,4 +1574,4 @@ class TableListField_ItemRequest extends RequestHandler {
 		return $this->ctf;
 	}
 }
-?>
+
diff --git a/forms/TabularStyle.php b/forms/TabularStyle.php
index c3b306de1..f82d7b497 100644
--- a/forms/TabularStyle.php
+++ b/forms/TabularStyle.php
@@ -65,4 +65,3 @@ class TabularStyle extends ViewableData {
 		$this->form->$field = $val;
 	}
 }
-?>
\ No newline at end of file
diff --git a/forms/TimeField.php b/forms/TimeField.php
index 2fed66807..204b06108 100644
--- a/forms/TimeField.php
+++ b/forms/TimeField.php
@@ -221,4 +221,3 @@ class TimeField_Readonly extends TimeField {
 		return true;	
 	}
 }
-?>
\ No newline at end of file
diff --git a/forms/ToggleCompositeField.php b/forms/ToggleCompositeField.php
index f178b379b..d6246bbdc 100644
--- a/forms/ToggleCompositeField.php
+++ b/forms/ToggleCompositeField.php
@@ -52,4 +52,3 @@ class ToggleCompositeField extends CompositeField {
 	}
 }
 
-?>
\ No newline at end of file
diff --git a/forms/ToggleField.php b/forms/ToggleField.php
index fb36cecb7..f82e719a5 100644
--- a/forms/ToggleField.php
+++ b/forms/ToggleField.php
@@ -98,4 +98,3 @@ HTML;
 	}
 }
 
-?>
\ No newline at end of file
diff --git a/forms/Validator.php b/forms/Validator.php
index 960edc998..e6ccb9563 100644
--- a/forms/Validator.php
+++ b/forms/Validator.php
@@ -264,4 +264,4 @@ JS;
 	
 	abstract function php($data);
 }
-?>
+
diff --git a/i18n/i18n.php b/i18n/i18n.php
index 44e1ecc38..0e0553c2d 100644
--- a/i18n/i18n.php
+++ b/i18n/i18n.php
@@ -1958,4 +1958,4 @@ class i18n extends Object {
 	}
 }
 
-?>
+
diff --git a/i18n/i18nEntityProvider.php b/i18n/i18nEntityProvider.php
index 7c7e4fec3..1908b72fe 100644
--- a/i18n/i18nEntityProvider.php
+++ b/i18n/i18nEntityProvider.php
@@ -67,4 +67,3 @@ interface i18nEntityProvider {
 	 */
 	function provideI18nEntities();
 }
-?>
\ No newline at end of file
diff --git a/i18n/i18nTextCollector.php b/i18n/i18nTextCollector.php
index 3591e5b88..ea0509280 100644
--- a/i18n/i18nTextCollector.php
+++ b/i18n/i18nTextCollector.php
@@ -442,4 +442,3 @@ class i18nTextCollector extends Object {
 		$this->defaultLocale = $locale;
 	}
 }
-?>
\ No newline at end of file
diff --git a/model/DataExtension.php b/model/DataExtension.php
index 3e0603459..85313df9a 100644
--- a/model/DataExtension.php
+++ b/model/DataExtension.php
@@ -241,4 +241,4 @@ abstract class DataExtension extends Extension {
 	}
 
 }
-?>
+
diff --git a/model/Database.php b/model/Database.php
index 8d443ebb8..cfaf06485 100644
--- a/model/Database.php
+++ b/model/Database.php
@@ -1087,4 +1087,4 @@ abstract class SS_Query implements Iterator {
 	abstract function seek($rowNum);
 }
 
-?>
+
diff --git a/model/DatabaseAdmin.php b/model/DatabaseAdmin.php
index d05413c7a..c00b400e5 100644
--- a/model/DatabaseAdmin.php
+++ b/model/DatabaseAdmin.php
@@ -317,4 +317,4 @@ class DatabaseAdmin extends Controller {
 
 }
 
-?>
+
diff --git a/model/HiddenClass.php b/model/HiddenClass.php
index 083d873fd..9ffbbc51a 100644
--- a/model/HiddenClass.php
+++ b/model/HiddenClass.php
@@ -8,4 +8,3 @@ interface HiddenClass {
 	
 }
 
-?>
\ No newline at end of file
diff --git a/model/Hierarchy.php b/model/Hierarchy.php
index ee6fe8820..daf80c745 100644
--- a/model/Hierarchy.php
+++ b/model/Hierarchy.php
@@ -677,4 +677,4 @@ class Hierarchy extends DataExtension {
 	}
 }
 
-?>
+
diff --git a/model/SQLQuery.php b/model/SQLQuery.php
index bfd6b7513..f818ceff1 100644
--- a/model/SQLQuery.php
+++ b/model/SQLQuery.php
@@ -683,4 +683,3 @@ class SQLQuery {
 
 }
 
-?>
\ No newline at end of file
diff --git a/model/ValidationException.php b/model/ValidationException.php
index 3ffddaee8..4b859d4f5 100644
--- a/model/ValidationException.php
+++ b/model/ValidationException.php
@@ -29,4 +29,3 @@ class ValidationException extends Exception {
 		return $this->result;	
 	}
 }
-?>
\ No newline at end of file
diff --git a/model/fieldtypes/Boolean.php b/model/fieldtypes/Boolean.php
index 135416157..3fd252908 100644
--- a/model/fieldtypes/Boolean.php
+++ b/model/fieldtypes/Boolean.php
@@ -75,4 +75,4 @@ class Boolean extends DBField {
 	
 }
 
-?>
+
diff --git a/model/fieldtypes/Currency.php b/model/fieldtypes/Currency.php
index 61c2b5f79..23a10c734 100644
--- a/model/fieldtypes/Currency.php
+++ b/model/fieldtypes/Currency.php
@@ -59,4 +59,3 @@ class Currency extends Decimal {
 	}
 }
 
-?>
\ No newline at end of file
diff --git a/model/fieldtypes/DBField.php b/model/fieldtypes/DBField.php
index 71866782e..5e7d80d2c 100644
--- a/model/fieldtypes/DBField.php
+++ b/model/fieldtypes/DBField.php
@@ -299,4 +299,3 @@ DBG;
 	}
 	
 }
-?>
\ No newline at end of file
diff --git a/model/fieldtypes/DBLocale.php b/model/fieldtypes/DBLocale.php
index cfdcaadee..7ef22f68d 100644
--- a/model/fieldtypes/DBLocale.php
+++ b/model/fieldtypes/DBLocale.php
@@ -60,4 +60,4 @@ class DBLocale extends Varchar {
 		return (isset($common_names[$this->value])) ? $common_names[$this->value] : false;
 	}
 }
-?>
+
diff --git a/model/fieldtypes/Datetime.php b/model/fieldtypes/Datetime.php
index ae843c6e7..77a56688a 100644
--- a/model/fieldtypes/Datetime.php
+++ b/model/fieldtypes/Datetime.php
@@ -116,4 +116,3 @@ class SS_Datetime extends Date {
 	}
 }
 
-?>
\ No newline at end of file
diff --git a/model/fieldtypes/Decimal.php b/model/fieldtypes/Decimal.php
index 57671b632..4ccd2bf7b 100644
--- a/model/fieldtypes/Decimal.php
+++ b/model/fieldtypes/Decimal.php
@@ -67,4 +67,4 @@ class Decimal extends DBField {
 	
 }
 
-?>
+
diff --git a/model/fieldtypes/Enum.php b/model/fieldtypes/Enum.php
index c1103185c..da0865667 100644
--- a/model/fieldtypes/Enum.php
+++ b/model/fieldtypes/Enum.php
@@ -94,4 +94,4 @@ class Enum extends DBField {
 	}
 }
 
-?>
+
diff --git a/model/fieldtypes/ForeignKey.php b/model/fieldtypes/ForeignKey.php
index e84ebebfb..a8d298e40 100644
--- a/model/fieldtypes/ForeignKey.php
+++ b/model/fieldtypes/ForeignKey.php
@@ -52,4 +52,4 @@ class ForeignKey extends Int {
 	}
 }
 
-?>
+
diff --git a/model/fieldtypes/HTMLText.php b/model/fieldtypes/HTMLText.php
index c5fe65dd7..046be3262 100644
--- a/model/fieldtypes/HTMLText.php
+++ b/model/fieldtypes/HTMLText.php
@@ -142,4 +142,4 @@ class HTMLText extends Text {
 
 }
 
-?>
+
diff --git a/model/fieldtypes/Int.php b/model/fieldtypes/Int.php
index 4a960feba..408b0418e 100644
--- a/model/fieldtypes/Int.php
+++ b/model/fieldtypes/Int.php
@@ -65,4 +65,3 @@ class Int extends DBField {
 	
 }
 
-?>
\ No newline at end of file
diff --git a/model/fieldtypes/Money.php b/model/fieldtypes/Money.php
index f6bae8e07..d654068a0 100644
--- a/model/fieldtypes/Money.php
+++ b/model/fieldtypes/Money.php
@@ -292,4 +292,3 @@ class Money extends DBField implements CompositeDBField {
 		return (string)$this->getAmount();
 	}
 }
-?>
\ No newline at end of file
diff --git a/model/fieldtypes/Percentage.php b/model/fieldtypes/Percentage.php
index b6d533bad..bb384a5b2 100644
--- a/model/fieldtypes/Percentage.php
+++ b/model/fieldtypes/Percentage.php
@@ -41,4 +41,4 @@ class Percentage extends Decimal {
 	}
 }
 
-?>
+
diff --git a/model/fieldtypes/PrimaryKey.php b/model/fieldtypes/PrimaryKey.php
index af767b5c6..8e3a9d6df 100644
--- a/model/fieldtypes/PrimaryKey.php
+++ b/model/fieldtypes/PrimaryKey.php
@@ -31,4 +31,3 @@ class PrimaryKey extends Int {
 	}
 }
 
-?>
\ No newline at end of file
diff --git a/model/fieldtypes/Text.php b/model/fieldtypes/Text.php
index 322b4b6b5..5dec0edde 100644
--- a/model/fieldtypes/Text.php
+++ b/model/fieldtypes/Text.php
@@ -350,4 +350,4 @@ class Text extends StringField {
 	}
 }
 
-?>
+
diff --git a/model/fieldtypes/Time.php b/model/fieldtypes/Time.php
index c146be5ea..50b92cf63 100644
--- a/model/fieldtypes/Time.php
+++ b/model/fieldtypes/Time.php
@@ -75,4 +75,3 @@ class Time extends DBField {
 	}
 	
 }
-?>
\ No newline at end of file
diff --git a/model/fieldtypes/Varchar.php b/model/fieldtypes/Varchar.php
index ea8029eb7..0ca396907 100644
--- a/model/fieldtypes/Varchar.php
+++ b/model/fieldtypes/Varchar.php
@@ -90,4 +90,4 @@ class Varchar extends StringField {
 	}
 }
 
-?>
+
diff --git a/model/fieldtypes/Year.php b/model/fieldtypes/Year.php
index 48861341c..24369a0b1 100644
--- a/model/fieldtypes/Year.php
+++ b/model/fieldtypes/Year.php
@@ -45,4 +45,3 @@ class Year extends DBField {
 	}
 	
 }
-?>
\ No newline at end of file
diff --git a/parsers/BBCodeParser.php b/parsers/BBCodeParser.php
index ae798d478..ad45b0dcb 100644
--- a/parsers/BBCodeParser.php
+++ b/parsers/BBCodeParser.php
@@ -165,4 +165,3 @@ class BBCodeParser extends TextParser {
 	}
 	
 }
-?>
\ No newline at end of file
diff --git a/parsers/HTML/BBCodeParser/Filter.php b/parsers/HTML/BBCodeParser/Filter.php
index c3ba3ca96..8ca2723bf 100644
--- a/parsers/HTML/BBCodeParser/Filter.php
+++ b/parsers/HTML/BBCodeParser/Filter.php
@@ -9,4 +9,3 @@ require_once 'HTML/HTMLBBCodeParser.php';
 class SSHTMLBBCodeParser_Filter extends SSHTMLBBCodeParser
 {
 }
-?>
\ No newline at end of file
diff --git a/parsers/HTML/BBCodeParser/Filter/Basic.php b/parsers/HTML/BBCodeParser/Filter/Basic.php
index b3d4e9004..250b1a70a 100644
--- a/parsers/HTML/BBCodeParser/Filter/Basic.php
+++ b/parsers/HTML/BBCodeParser/Filter/Basic.php
@@ -73,4 +73,3 @@ class SSHTMLBBCodeParser_Filter_Basic extends SSHTMLBBCodeParser_Filter
 }
 
 
-?>
\ No newline at end of file
diff --git a/parsers/HTML/BBCodeParser/Filter/EmailLinks.php b/parsers/HTML/BBCodeParser/Filter/EmailLinks.php
index c46cb1e21..fb7aaa471 100644
--- a/parsers/HTML/BBCodeParser/Filter/EmailLinks.php
+++ b/parsers/HTML/BBCodeParser/Filter/EmailLinks.php
@@ -89,4 +89,4 @@ class SSHTMLBBCodeParser_Filter_EmailLinks extends SSHTMLBBCodeParser_Filter
 }
 
 
-?>
+
diff --git a/parsers/HTML/BBCodeParser/Filter/Extended.php b/parsers/HTML/BBCodeParser/Filter/Extended.php
index 9858ad4c9..8b2aa2fd4 100644
--- a/parsers/HTML/BBCodeParser/Filter/Extended.php
+++ b/parsers/HTML/BBCodeParser/Filter/Extended.php
@@ -107,4 +107,4 @@ class SSHTMLBBCodeParser_Filter_Extended extends SSHTMLBBCodeParser_Filter
 	}
 }
 
-?>
+
diff --git a/parsers/HTML/BBCodeParser/Filter/Links.php b/parsers/HTML/BBCodeParser/Filter/Links.php
index 2d800e3c7..3a9d7632e 100644
--- a/parsers/HTML/BBCodeParser/Filter/Links.php
+++ b/parsers/HTML/BBCodeParser/Filter/Links.php
@@ -206,4 +206,3 @@ class SSHTMLBBCodeParser_Filter_Links extends SSHTMLBBCodeParser_Filter
         return $matches[6];
     }
 }
-?>
\ No newline at end of file
diff --git a/parsers/HTML/BBCodeParser/Filter/Lists.php b/parsers/HTML/BBCodeParser/Filter/Lists.php
index 8f567f67d..ed05498d0 100644
--- a/parsers/HTML/BBCodeParser/Filter/Lists.php
+++ b/parsers/HTML/BBCodeParser/Filter/Lists.php
@@ -109,4 +109,3 @@ class SSHTMLBBCodeParser_Filter_Lists extends SSHTMLBBCodeParser_Filter
 }
 
 
-?>
\ No newline at end of file
diff --git a/parsers/HTML/HTMLBBCodeParser.php b/parsers/HTML/HTMLBBCodeParser.php
index 03f5e77e5..137cb5036 100644
--- a/parsers/HTML/HTMLBBCodeParser.php
+++ b/parsers/HTML/HTMLBBCodeParser.php
@@ -871,4 +871,3 @@ class SSHTMLBBCodeParser
         return $str;
     }
 }
-?>
\ No newline at end of file
diff --git a/parsers/SQLFormatter.php b/parsers/SQLFormatter.php
index 2b2766bd9..539f0addd 100644
--- a/parsers/SQLFormatter.php
+++ b/parsers/SQLFormatter.php
@@ -55,4 +55,3 @@ class SQLFormatter extends Object {
 	}
 	
 }
-?>
\ No newline at end of file
diff --git a/parsers/TextParser.php b/parsers/TextParser.php
index 6c2c8477b..9f8f89afb 100644
--- a/parsers/TextParser.php
+++ b/parsers/TextParser.php
@@ -50,4 +50,3 @@ abstract class TextParser extends Object {
 	 */
 	abstract function parse();
 }
-?>
\ No newline at end of file
diff --git a/search/SearchContext.php b/search/SearchContext.php
index 39d349bf0..8836ba8d6 100644
--- a/search/SearchContext.php
+++ b/search/SearchContext.php
@@ -266,4 +266,4 @@ class SearchContext extends Object {
 	}
 	
 }
-?>
+
diff --git a/search/filters/EndsWithFilter.php b/search/filters/EndsWithFilter.php
index 89aa14ee5..79d4375e2 100644
--- a/search/filters/EndsWithFilter.php
+++ b/search/filters/EndsWithFilter.php
@@ -32,4 +32,3 @@ class EndsWithFilter extends SearchFilter {
 		return $this->getValue() == null || $this->getValue() == '';
 	}
 }
-?>
\ No newline at end of file
diff --git a/search/filters/ExactMatchFilter.php b/search/filters/ExactMatchFilter.php
index 73cb7dc63..a614a6c04 100644
--- a/search/filters/ExactMatchFilter.php
+++ b/search/filters/ExactMatchFilter.php
@@ -33,4 +33,3 @@ class ExactMatchFilter extends SearchFilter {
 		return $this->getValue() == null || $this->getValue() == '';
 	}
 }
-?>
\ No newline at end of file
diff --git a/search/filters/ExactMatchMultiFilter.php b/search/filters/ExactMatchMultiFilter.php
index 7c4c80b38..770f63e70 100644
--- a/search/filters/ExactMatchMultiFilter.php
+++ b/search/filters/ExactMatchMultiFilter.php
@@ -50,4 +50,3 @@ class ExactMatchMultiFilter extends SearchFilter {
 		return $this->getValue() == null || $this->getValue() == '';
 	}
 }
-?>
\ No newline at end of file
diff --git a/search/filters/FulltextFilter.php b/search/filters/FulltextFilter.php
index 0401331f0..27d06d500 100644
--- a/search/filters/FulltextFilter.php
+++ b/search/filters/FulltextFilter.php
@@ -40,4 +40,3 @@ class FulltextFilter extends SearchFilter {
 		return $this->getValue() == null || $this->getValue() == '';
 	}
 }
-?>
\ No newline at end of file
diff --git a/search/filters/GreaterThanFilter.php b/search/filters/GreaterThanFilter.php
index 86ca0d05f..756f74779 100644
--- a/search/filters/GreaterThanFilter.php
+++ b/search/filters/GreaterThanFilter.php
@@ -25,4 +25,3 @@ class GreaterThanFilter extends SearchFilter {
 		return $this->getValue() == null || $this->getValue() == '';
 	}
 }
-?>
\ No newline at end of file
diff --git a/search/filters/LessThanFilter.php b/search/filters/LessThanFilter.php
index bed270c3e..ac38d0349 100644
--- a/search/filters/LessThanFilter.php
+++ b/search/filters/LessThanFilter.php
@@ -26,4 +26,3 @@ class LessThanFilter extends SearchFilter {
 		return $this->getValue() == null || $this->getValue() == '';
 	}
 }
-?>
\ No newline at end of file
diff --git a/search/filters/NegationFilter.php b/search/filters/NegationFilter.php
index 09eaba53a..9a1f776d1 100755
--- a/search/filters/NegationFilter.php
+++ b/search/filters/NegationFilter.php
@@ -18,4 +18,3 @@ class NegationFilter extends SearchFilter {
 	
 }
 
-?>
\ No newline at end of file
diff --git a/search/filters/PartialMatchFilter.php b/search/filters/PartialMatchFilter.php
index 4756bd5d9..1894a7237 100644
--- a/search/filters/PartialMatchFilter.php
+++ b/search/filters/PartialMatchFilter.php
@@ -25,4 +25,3 @@ class PartialMatchFilter extends SearchFilter {
 		return $this->getValue() == null || $this->getValue() == '';
 	}
 }
-?>
\ No newline at end of file
diff --git a/search/filters/SearchFilter.php b/search/filters/SearchFilter.php
index 615ab7c1b..89ab3c56c 100644
--- a/search/filters/SearchFilter.php
+++ b/search/filters/SearchFilter.php
@@ -172,4 +172,3 @@ abstract class SearchFilter extends Object {
 	}
 	
 }
-?>
\ No newline at end of file
diff --git a/search/filters/StartsWithFilter.php b/search/filters/StartsWithFilter.php
index 35fb33ed6..f66519ac4 100644
--- a/search/filters/StartsWithFilter.php
+++ b/search/filters/StartsWithFilter.php
@@ -32,4 +32,3 @@ class StartsWithFilter extends SearchFilter {
 		return $this->getValue() == null || $this->getValue() == '';
 	}
 }
-?>
\ No newline at end of file
diff --git a/search/filters/StartsWithMultiFilter.php b/search/filters/StartsWithMultiFilter.php
index 7bf6c5094..7d6909292 100644
--- a/search/filters/StartsWithMultiFilter.php
+++ b/search/filters/StartsWithMultiFilter.php
@@ -32,4 +32,3 @@ class StartsWithMultiFilter extends SearchFilter {
 		return $this->getValue() == null || $this->getValue() == '';
 	}
 }
-?>
\ No newline at end of file
diff --git a/search/filters/SubstringFilter.php b/search/filters/SubstringFilter.php
index 6d796cac3..b98a2a1c5 100755
--- a/search/filters/SubstringFilter.php
+++ b/search/filters/SubstringFilter.php
@@ -31,4 +31,3 @@ class SubstringFilter extends PartialMatchFilter {
 	}
 }
 
-?>
\ No newline at end of file
diff --git a/search/filters/WithinRangeFilter.php b/search/filters/WithinRangeFilter.php
index 4cbcac4ce..f70816642 100644
--- a/search/filters/WithinRangeFilter.php
+++ b/search/filters/WithinRangeFilter.php
@@ -37,4 +37,3 @@ class WithinRangeFilter extends SearchFilter {
 	
 }
 
-?>
\ No newline at end of file
diff --git a/security/Authenticator.php b/security/Authenticator.php
index fc4bcfc0e..0a226a89a 100644
--- a/security/Authenticator.php
+++ b/security/Authenticator.php
@@ -186,4 +186,3 @@ abstract class Authenticator extends Object {
   }
 }
 
-?>
\ No newline at end of file
diff --git a/security/ChangePasswordForm.php b/security/ChangePasswordForm.php
index 36261ad42..21deb3402 100644
--- a/security/ChangePasswordForm.php
+++ b/security/ChangePasswordForm.php
@@ -134,4 +134,3 @@ class ChangePasswordForm extends Form {
 
 }
 
-?>
\ No newline at end of file
diff --git a/security/Group.php b/security/Group.php
index 10dfea0d5..e3bc0d34f 100755
--- a/security/Group.php
+++ b/security/Group.php
@@ -491,4 +491,4 @@ class Group extends DataObject {
 	}
 }
 	
-?>
+
diff --git a/security/LoginAttempt.php b/security/LoginAttempt.php
index d09750e03..4a9e47a41 100644
--- a/security/LoginAttempt.php
+++ b/security/LoginAttempt.php
@@ -48,4 +48,3 @@ class LoginAttempt extends DataObject {
 	}
 	
 }
-?>
\ No newline at end of file
diff --git a/security/LoginForm.php b/security/LoginForm.php
index 92537bf36..63c1be4e4 100644
--- a/security/LoginForm.php
+++ b/security/LoginForm.php
@@ -41,4 +41,3 @@ abstract class LoginForm extends Form {
 	}
 }
 
-?>
\ No newline at end of file
diff --git a/security/MemberAuthenticator.php b/security/MemberAuthenticator.php
index d2ada0adc..40dd9de05 100644
--- a/security/MemberAuthenticator.php
+++ b/security/MemberAuthenticator.php
@@ -146,4 +146,3 @@ class MemberAuthenticator extends Authenticator {
 	}
 }
 
-?>
\ No newline at end of file
diff --git a/security/MemberLoginForm.php b/security/MemberLoginForm.php
index 84df46cff..b0850e52b 100644
--- a/security/MemberLoginForm.php
+++ b/security/MemberLoginForm.php
@@ -280,4 +280,3 @@ JS
 	}
 
 }
-?>
\ No newline at end of file
diff --git a/security/Permission.php b/security/Permission.php
index 30c226a67..b856c6a85 100644
--- a/security/Permission.php
+++ b/security/Permission.php
@@ -689,4 +689,4 @@ class Permission_Group {
 	}
 }
 
-?>
+
diff --git a/security/PermissionProvider.php b/security/PermissionProvider.php
index 94b1e511d..d9b127cf1 100644
--- a/security/PermissionProvider.php
+++ b/security/PermissionProvider.php
@@ -15,4 +15,3 @@ interface PermissionProvider {
 	function providePermissions();	
 }
 
-?>
\ No newline at end of file
diff --git a/static-main.php b/static-main.php
index a1dc997f6..139eb633e 100644
--- a/static-main.php
+++ b/static-main.php
@@ -103,4 +103,3 @@ if (
 	include 'main.php';
 }
 
-?>
\ No newline at end of file
diff --git a/tasks/MonthlyTask.php b/tasks/MonthlyTask.php
index 83a89ade4..0c4065727 100644
--- a/tasks/MonthlyTask.php
+++ b/tasks/MonthlyTask.php
@@ -12,4 +12,3 @@
 class MonthlyTask extends ScheduledTask {
 
 }
-?>
\ No newline at end of file
diff --git a/tasks/QuarterHourlyTask.php b/tasks/QuarterHourlyTask.php
index fcbc40d12..f2384f90b 100644
--- a/tasks/QuarterHourlyTask.php
+++ b/tasks/QuarterHourlyTask.php
@@ -12,4 +12,3 @@
 class QuarterHourlyTask extends ScheduledTask {
 	
 }
-?>
\ No newline at end of file
diff --git a/tasks/YearlyTask.php b/tasks/YearlyTask.php
index 585904482..c5da364f5 100644
--- a/tasks/YearlyTask.php
+++ b/tasks/YearlyTask.php
@@ -12,4 +12,3 @@
 class YearlyTask extends ScheduledTask {
 
 }
-?>
\ No newline at end of file
diff --git a/tasks/i18nTextCollectorTask.php b/tasks/i18nTextCollectorTask.php
index bcd3031b7..d423d3314 100644
--- a/tasks/i18nTextCollectorTask.php
+++ b/tasks/i18nTextCollectorTask.php
@@ -33,4 +33,3 @@ class i18nTextCollectorTask extends BuildTask {
 		return $c->run($restrictModules);
 	}
 }
-?>
\ No newline at end of file
diff --git a/tests/api/RestfulServerTest.php b/tests/api/RestfulServerTest.php
index 557cd6dc4..ed9b519fb 100644
--- a/tests/api/RestfulServerTest.php
+++ b/tests/api/RestfulServerTest.php
@@ -564,4 +564,4 @@ class RestfulServerTest_AuthorRating extends DataObject implements TestOnly {
 		return true;
 	}
 }
-?>
+
diff --git a/tests/api/SoapModelAccessTest.php b/tests/api/SoapModelAccessTest.php
index c5820f481..4a460d030 100644
--- a/tests/api/SoapModelAccessTest.php
+++ b/tests/api/SoapModelAccessTest.php
@@ -160,4 +160,3 @@ class SoapModelAccessTest_Page extends DataObject implements TestOnly {
 		'Content' => 'HTMLText',
 	);
 }
-?>
\ No newline at end of file
diff --git a/tests/core/ArrayDataTest.php b/tests/core/ArrayDataTest.php
index bc9bd24d6..f0cfd6e25 100644
--- a/tests/core/ArrayDataTest.php
+++ b/tests/core/ArrayDataTest.php
@@ -115,4 +115,4 @@ class ArrayDataTest_NonEmptyObject {
 
 }
 
-?>
+
diff --git a/tests/core/manifest/TokenisedRegularExpressionTest.php b/tests/core/manifest/TokenisedRegularExpressionTest.php
index 843301e14..eecf61c8e 100644
--- a/tests/core/manifest/TokenisedRegularExpressionTest.php
+++ b/tests/core/manifest/TokenisedRegularExpressionTest.php
@@ -47,7 +47,7 @@ interface InterfaceC extends InterfaceA, InterfaceB {
 }
 interface InterfaceD extends InterfaceA, InterfaceB, InterfaceC {
 }
-?>
+
 PHP
 );
 	}
@@ -86,7 +86,7 @@ class ClassG implements subtest\\InterfaceG {
 
 }
 
-?>
+
 PHP
 );
 	}
diff --git a/tests/dev/CsvBulkLoaderTest.php b/tests/dev/CsvBulkLoaderTest.php
index 2f0167bfe..c1fcf9dcd 100644
--- a/tests/dev/CsvBulkLoaderTest.php
+++ b/tests/dev/CsvBulkLoaderTest.php
@@ -249,4 +249,4 @@ class CsvBulkLoaderTest_PlayerContract extends DataObject implements TestOnly {
 	);
 }
 
-?>
+
diff --git a/tests/forms/CheckboxFieldTest.php b/tests/forms/CheckboxFieldTest.php
index a17305d0f..985dffb28 100644
--- a/tests/forms/CheckboxFieldTest.php
+++ b/tests/forms/CheckboxFieldTest.php
@@ -126,4 +126,3 @@ class CheckboxFieldTest_Article extends DataObject implements TestOnly {
 	);
 	
 }
-?>
\ No newline at end of file
diff --git a/tests/forms/ComplexTableFieldTest.php b/tests/forms/ComplexTableFieldTest.php
index 65ba072fe..154106df9 100644
--- a/tests/forms/ComplexTableFieldTest.php
+++ b/tests/forms/ComplexTableFieldTest.php
@@ -198,4 +198,3 @@ class ComplexTableFieldTest_Sponsor extends DataObject implements TestOnly {
 	);
 
 }
-?>
\ No newline at end of file
diff --git a/tests/forms/CompositeFieldTest.php b/tests/forms/CompositeFieldTest.php
index 6f3696678..4d87b693d 100644
--- a/tests/forms/CompositeFieldTest.php
+++ b/tests/forms/CompositeFieldTest.php
@@ -30,4 +30,3 @@ class CompositeFieldTest extends SapphireTest {
 	}
 	
 }
-?>
\ No newline at end of file
diff --git a/tests/forms/DateFieldTest.php b/tests/forms/DateFieldTest.php
index 0fccc0d20..24d990cd2 100644
--- a/tests/forms/DateFieldTest.php
+++ b/tests/forms/DateFieldTest.php
@@ -181,4 +181,3 @@ class DateFieldTest extends SapphireTest {
 	}
 	
 }
-?>
\ No newline at end of file
diff --git a/tests/forms/DropdownFieldTest.php b/tests/forms/DropdownFieldTest.php
index b00e300b3..22d85b81c 100644
--- a/tests/forms/DropdownFieldTest.php
+++ b/tests/forms/DropdownFieldTest.php
@@ -212,4 +212,3 @@ class DropdownFieldTest extends SapphireTest {
 	}
 	
 }
-?>
\ No newline at end of file
diff --git a/tests/forms/FormFieldTest.php b/tests/forms/FormFieldTest.php
index 88020f3e0..16584aa33 100644
--- a/tests/forms/FormFieldTest.php
+++ b/tests/forms/FormFieldTest.php
@@ -117,4 +117,3 @@ class FormFieldTest extends SapphireTest {
 	}
 	
 }
-?>
\ No newline at end of file
diff --git a/tests/forms/FormScaffolderTest.php b/tests/forms/FormScaffolderTest.php
index 3da9c0446..365d9d0ac 100644
--- a/tests/forms/FormScaffolderTest.php
+++ b/tests/forms/FormScaffolderTest.php
@@ -136,4 +136,3 @@ class FormScaffolderTest_ArticleExtension extends DataExtension implements TestO
 }
 
 DataObject::add_extension('FormScaffolderTest_Article', 'FormScaffolderTest_ArticleExtension');
-?>
\ No newline at end of file
diff --git a/tests/forms/FormTest.php b/tests/forms/FormTest.php
index a110c18d6..7ad8565fb 100644
--- a/tests/forms/FormTest.php
+++ b/tests/forms/FormTest.php
@@ -513,4 +513,3 @@ class FormTest_ControllerWithSecurityToken extends Controller implements TestOnl
 Director::addRules(50, array(
 	'FormTest_Controller' => "FormTest_Controller",
 ));
-?>
\ No newline at end of file
diff --git a/tests/forms/MoneyFieldTest.php b/tests/forms/MoneyFieldTest.php
index 441ff5708..7eba317f8 100644
--- a/tests/forms/MoneyFieldTest.php
+++ b/tests/forms/MoneyFieldTest.php
@@ -96,4 +96,3 @@ class MoneyFieldTest_CustomSetter_Object extends DataObject implements TestOnly
 
 	}
 }
-?>
\ No newline at end of file
diff --git a/tests/i18n/_fakewebroot/i18nothermodule/code/i18nOtherModule.php b/tests/i18n/_fakewebroot/i18nothermodule/code/i18nOtherModule.php
index 9021aee3e..d7cdda5ff 100644
--- a/tests/i18n/_fakewebroot/i18nothermodule/code/i18nOtherModule.php
+++ b/tests/i18n/_fakewebroot/i18nothermodule/code/i18nOtherModule.php
@@ -7,4 +7,3 @@ class i18nOtherModule extends Object {
 		);
 	}
 }
-?>
\ No newline at end of file
diff --git a/tests/i18n/_fakewebroot/i18nothermodule/code/i18nTestModuleDecorator.php b/tests/i18n/_fakewebroot/i18nothermodule/code/i18nTestModuleDecorator.php
index cca6e65ac..49de61fea 100644
--- a/tests/i18n/_fakewebroot/i18nothermodule/code/i18nTestModuleDecorator.php
+++ b/tests/i18n/_fakewebroot/i18nothermodule/code/i18nTestModuleDecorator.php
@@ -8,4 +8,3 @@ class i18nTestModuleExtension extends DataExtension {
 		);
 	}
 }
-?>
\ No newline at end of file
diff --git a/tests/i18n/_fakewebroot/i18ntestmodule/code/subfolder/i18nTestSubModule.php b/tests/i18n/_fakewebroot/i18ntestmodule/code/subfolder/i18nTestSubModule.php
index b77464ace..6091ab6d0 100644
--- a/tests/i18n/_fakewebroot/i18ntestmodule/code/subfolder/i18nTestSubModule.php
+++ b/tests/i18n/_fakewebroot/i18ntestmodule/code/subfolder/i18nTestSubModule.php
@@ -6,4 +6,3 @@ class i18nTestSubModule extends Object {
 		parent::__construct();
 	}
 }
-?>
\ No newline at end of file
diff --git a/tests/i18n/i18nTest.php b/tests/i18n/i18nTest.php
index fa637f2c9..c0ae9460a 100644
--- a/tests/i18n/i18nTest.php
+++ b/tests/i18n/i18nTest.php
@@ -300,4 +300,4 @@ class i18nTest_Object extends Object implements TestOnly, i18nEntityProvider {
 		);
 	}
 }
-?>
+
diff --git a/tests/i18n/i18nTextCollectorTest.php b/tests/i18n/i18nTextCollectorTest.php
index bcc759a72..27c849ee7 100644
--- a/tests/i18n/i18nTextCollectorTest.php
+++ b/tests/i18n/i18nTextCollectorTest.php
@@ -589,4 +589,3 @@ PHP;
 	}
 
 }
-?>
\ No newline at end of file
diff --git a/tests/i18n/i18nTextCollectorTestMyObject.php b/tests/i18n/i18nTextCollectorTestMyObject.php
index eb193e42a..1516e40f2 100644
--- a/tests/i18n/i18nTextCollectorTestMyObject.php
+++ b/tests/i18n/i18nTextCollectorTestMyObject.php
@@ -17,4 +17,3 @@ class i18nTextCollectorTestMyObject extends DataObject implements TestOnly {
 	
 	static $plural_name = "My Objects";
 }
-?>
\ No newline at end of file
diff --git a/tests/i18n/i18nTextCollectorTestMySubObject.php b/tests/i18n/i18nTextCollectorTestMySubObject.php
index 7ec8ad151..ac39838d7 100644
--- a/tests/i18n/i18nTextCollectorTestMySubObject.php
+++ b/tests/i18n/i18nTextCollectorTestMySubObject.php
@@ -16,4 +16,3 @@ class i18nTextCollectorTestMySubObject extends i18nTextCollectorTestMyObject imp
 	
 	static $plural_name = "My Sub Objects";
 }
-?>
\ No newline at end of file
diff --git a/tests/model/CompositeDBFieldTest.php b/tests/model/CompositeDBFieldTest.php
index d675e731c..673af93e5 100644
--- a/tests/model/CompositeDBFieldTest.php
+++ b/tests/model/CompositeDBFieldTest.php
@@ -50,4 +50,3 @@ class SubclassedDBFieldObject extends CompositeDBFieldTest_DataObject {
 		'OtherMoney' => 'Money', 
 	);
 }
-?>
\ No newline at end of file
diff --git a/tests/model/DBFieldTest.php b/tests/model/DBFieldTest.php
index 4d38bde1d..16e04548a 100644
--- a/tests/model/DBFieldTest.php
+++ b/tests/model/DBFieldTest.php
@@ -219,4 +219,4 @@ class DBFieldTest extends SapphireTest {
 	
 }
 
-?>
+
diff --git a/tests/model/DBLocaleTest.php b/tests/model/DBLocaleTest.php
index 98728943b..eeb435cbf 100644
--- a/tests/model/DBLocaleTest.php
+++ b/tests/model/DBLocaleTest.php
@@ -19,4 +19,3 @@ class DBLocaleTest extends SapphireTest {
 		$this->assertEquals($l->getNativeName(), 'Deutsch');
 	}
 }
-?>
\ No newline at end of file
diff --git a/tests/model/DataExtensionTest.php b/tests/model/DataExtensionTest.php
index 3e2ea11d9..869b9f3ad 100644
--- a/tests/model/DataExtensionTest.php
+++ b/tests/model/DataExtensionTest.php
@@ -311,4 +311,4 @@ class DataExtensionTest_AppliedToDO extends DataExtension implements TestOnly {
 DataObject::add_extension('DataExtensionTest_MyObject', 'DataExtensionTest_Ext1');
 DataObject::add_extension('DataExtensionTest_MyObject', 'DataExtensionTest_Ext2');
 DataObject::add_extension('DataExtensionTest_MyObject', 'DataExtensionTest_Faves');
-?>
+
diff --git a/tests/model/DataObjectDuplicationTest.php b/tests/model/DataObjectDuplicationTest.php
index ecf24f1f1..f2f0b6afa 100644
--- a/tests/model/DataObjectDuplicationTest.php
+++ b/tests/model/DataObjectDuplicationTest.php
@@ -104,4 +104,3 @@ class DataObjectDuplicateTestClass3 extends DataObject implements TestOnly {
 }
 
 
-?>
\ No newline at end of file
diff --git a/tests/model/DataObjectTest.php b/tests/model/DataObjectTest.php
index ca49fe580..6e44a1b92 100644
--- a/tests/model/DataObjectTest.php
+++ b/tests/model/DataObjectTest.php
@@ -1177,4 +1177,4 @@ class DataObjectTest_TeamComment extends DataObject {
 
 DataObject::add_extension('DataObjectTest_Team', 'DataObjectTest_Team_Extension');
 
-?>
+
diff --git a/tests/model/DataQueryTest.php b/tests/model/DataQueryTest.php
index a4ffa4ccb..0ee8896d1 100644
--- a/tests/model/DataQueryTest.php
+++ b/tests/model/DataQueryTest.php
@@ -15,4 +15,3 @@ class DataQueryTest extends SapphireTest {
 	}
 }
 
-?>
\ No newline at end of file
diff --git a/tests/model/DatabaseTest.php b/tests/model/DatabaseTest.php
index e40b831d3..2d10708be 100644
--- a/tests/model/DatabaseTest.php
+++ b/tests/model/DatabaseTest.php
@@ -133,4 +133,3 @@ class DatabaseTest_MyObject extends DataObject implements TestOnly {
 		'MyField' => 'Varchar'
 	);
 }
-?>
\ No newline at end of file
diff --git a/tests/model/DateTest.php b/tests/model/DateTest.php
index 048412734..44b1b498d 100644
--- a/tests/model/DateTest.php
+++ b/tests/model/DateTest.php
@@ -95,4 +95,3 @@ class DateTest extends SapphireTest {
 	}
 	
 }
-?>
\ No newline at end of file
diff --git a/tests/model/HTMLTextTest.php b/tests/model/HTMLTextTest.php
index 0fc14c10a..62a92e5ca 100644
--- a/tests/model/HTMLTextTest.php
+++ b/tests/model/HTMLTextTest.php
@@ -135,4 +135,3 @@ class HTMLTextTest extends SapphireTest {
 		$this->assertEquals($data->ATT(), '"this is a test"');
 	}
 }
-?>
\ No newline at end of file
diff --git a/tests/model/MoneyTest.php b/tests/model/MoneyTest.php
index f5196d9be..429769c7c 100644
--- a/tests/model/MoneyTest.php
+++ b/tests/model/MoneyTest.php
@@ -276,4 +276,3 @@ class MoneyTest_DataObject extends DataObject implements TestOnly {
 	);
 
 }
-?>
\ No newline at end of file
diff --git a/tests/model/PercentageTest.php b/tests/model/PercentageTest.php
index ae52e7c15..20c7b077f 100644
--- a/tests/model/PercentageTest.php
+++ b/tests/model/PercentageTest.php
@@ -44,4 +44,3 @@ class PercentageTest extends SapphireTest {
 	}
 	
 }
-?>
\ No newline at end of file
diff --git a/tests/model/SQLQueryTest.php b/tests/model/SQLQueryTest.php
index fa65c4596..8d92021b4 100755
--- a/tests/model/SQLQueryTest.php
+++ b/tests/model/SQLQueryTest.php
@@ -252,4 +252,4 @@ class SQLQueryTest_DO extends DataObject implements TestOnly {
 	);
 }
 
-?>
+
diff --git a/tests/parsers/SQLFormatterTest.php b/tests/parsers/SQLFormatterTest.php
index faa5b5b43..ef53a7e62 100644
--- a/tests/parsers/SQLFormatterTest.php
+++ b/tests/parsers/SQLFormatterTest.php
@@ -39,4 +39,3 @@ SQL;
 	}
 	
 }
-?>
\ No newline at end of file
diff --git a/tests/search/SearchContextTest.php b/tests/search/SearchContextTest.php
index cc7e0980b..c806ba2f0 100644
--- a/tests/search/SearchContextTest.php
+++ b/tests/search/SearchContextTest.php
@@ -261,4 +261,4 @@ class SearchContextTest_AllFilterTypes extends DataObject implements TestOnly {
 	
 }
 
-?>
+
diff --git a/tests/search/SearchFilterApplyRelationTest.php b/tests/search/SearchFilterApplyRelationTest.php
index b2a393008..c9580a119 100644
--- a/tests/search/SearchFilterApplyRelationTest.php
+++ b/tests/search/SearchFilterApplyRelationTest.php
@@ -188,4 +188,3 @@ class SearchFilterApplyRelationTest_ManyManyGrantChild extends SearchFilterApply
 	);
 }
 
-?>
\ No newline at end of file
diff --git a/tests/security/GroupTest.php b/tests/security/GroupTest.php
index 873fb55d6..b3e0c08ec 100644
--- a/tests/security/GroupTest.php
+++ b/tests/security/GroupTest.php
@@ -165,4 +165,3 @@ class GroupTest_MemberForm extends Form {
    }
    
 }
-?>
\ No newline at end of file