Merge remote-tracking branch 'origin/master' into cake5

# Conflicts:
#	tests/TestCase/View/Helper/GravatarHelperTest.php
#	tests/TestCase/View/Helper/QrCodeHelperTest.php

tests/TestCase/View/Helper/GravatarHelperTest.php

@@ -19,12 +19,12 @@ class GravatarHelperTest extends TestCase {
 	/**
 	 * @var string
 	 */
-	protected $garageEmail = '';
+	protected $testEmail;
 
 	/**
 	 * @var string
 	 */
-	protected $testEmail = '';
+	protected $garageEmail;
 
 	/**
 	 * SetUp method

tests/TestCase/View/Helper/QrCodeHelperTest.php

@@ -29,7 +29,7 @@ class QrCodeHelperTest extends TestCase {
 	/**
 	 * @var string
 	 */
-	protected $testEmail = '';
+	protected $testEmail;
 
 	/**
 	 * SetUp method