Merge branch 'develop'

Author: ssfinney

phpunit.xml.dist

@@ -48,7 +48,6 @@
              showOnlySummary="true"
              showUncoveredFiles="false"/>
         <log type="coverage-clover" target="build/phpunit/logs/clover.xml"/>
-        <log type="plain" target="./build/phpunit/logs/logfile.log"/>
         <log type="junit" target="./build/phpunit/logs/junit.xml"/>
     </logging>
 </phpunit>