Merge remote-tracking branch 'remotes/upstream/develop' into develop

anupdugar · anupdugar · commit 5afa00a9efd0 · 2015-05-27T16:05:48.000-05:00
diff --git a/dev/tests/unit/phpunit.xml.dist b/dev/tests/unit/phpunit.xml.dist
@@ -21,6 +21,7 @@
     </testsuite>
     <php>
         <ini name="date.timezone" value="America/Los_Angeles"/>
+        <ini name="xdebug.max_nesting_level" value="200"/>
     </php>
     <filter>
         <whitelist addUncoveredFilesFromWhiteList="true">
