Merge branch 'master' into 3.0

gsherwood · gsherwood · commit 2b904e167fb5 · 2017-01-31T11:25:21.000+11:00
diff --git a/.gitattributes b/.gitattributes
@@ -8,3 +8,6 @@
 /CodeSniffer/Standards/Zend/Tests export-ignore
 .travis.yml export-ignore
 package.xml export-ignore
+phpunit.xml.dist export-ignore
+php5-testingConfig.ini export-ignore
+php7-testingConfig.ini export-ignore
