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

CONTRIBUTING.md

@@ -1,3 +1,28 @@
 # Contributing to Fluent
 
-Before submitting bugs, please make sure to run the dev/tasks/FluentValidateTask task to debug any issues locally.
+As an open source project, fluent is open for anyone to use, fork, modify, or contribute back to.
+
+If you encounter a bug in fluent, you can either
+[leave an issue](https://github.com/tractorcow-farm/silverstripe-fluent/issues), or you could
+try your hand at fixing this via [a pull request](https://github.com/tractorcow-farm/silverstripe-fluent/pulls).
+
+Localisations can be submitted to [transifex](https://www.transifex.com/silverstripe/silverstripe-fluent/dashboard/).
+
+Keep in mind that support for this module is a best effort, and sometimes life happens. Please do not
+feel like you are being ignored if you do not get a prompt response to any questions!
+
+
+# Becoming a maintainer
+
+If you are someone who has a history of good contributing to Fluent (or really any module
+in the tractorcow vendor), we'd probably love to have you as a maintainer. This would give
+you write access, the ability to review the work of others' in the community, and get more of
+a say in the general development of the module.
+
+If you meet the following criteria and would like to apply, feel free to either [contact me directly](https://github.com/tractorcow)
+or leave an issue requesting access:
+
+ - Have contributed to Fluent in the past (not necessarily via code)
+ - Show quality of work / character (or mix thereof)
+ - Have been around long enough to make yourself familiar
+

readme.md

@@ -28,6 +28,12 @@ Back end control is provided by a simple CMS filter.
 Also, please [report any issues](https://github.com/tractorcow-farm/silverstripe-fluent/issues)
 you may encounter, as it helps us all out!
 
+## Contributing
+
+If you would like to contribute to Fluent, either via pull requests,
+localisations, or being a part of the contributing team, please see
+[the contributing guidelines](CONTRIBUTING.md)
+
 ## Credits and Authors
 
  * Damian Mooyman - <https://github.com/tractorcow-farm/silverstripe-fluent>

src/Dev/FluentTestState.php

@@ -34,6 +34,8 @@ public function tearDown(SapphireTest $test)
      */
     public function setUpOnce($class)
     {
+        // Clear locale static caching between tests.
+        Locale::clearCached();
     }
 
     /**