Merge remote-tracking branch 'origin/master' into 3.x

Author: tersmitten

CakePHP3Oefenweb/ruleset.xml renamed to CakePHPOefenweb/ruleset.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<ruleset name="CakePHP3Oefenweb">
+<ruleset name="CakePHPOefenweb">
 	<description>Oefenweb Code Sniffer for CakePHP 3</description>
 	<rule ref="../../../cakephp/cakephp-codesniffer/CakePHP">
 		<exclude name="Generic.Commenting.Todo"/>