Merge branch '2.6.x'

# Conflicts:
#	CHANGELOG.md
#	README.md
#	gradle.properties

Author: eli-darkly

CHANGELOG.md

@@ -22,6 +22,11 @@ All notable changes to the LaunchDarkly Java SDK will be documented in this file
 _This release was broken and should not be used._
 
 
+## [2.6.1] - 2018-03-01
+### Fixed
+- Improved performance when evaluating flags with custom attributes, by avoiding an unnecessary caught exception (thanks, [rbalamohan](https://github.com/launchdarkly/java-client/issues/113)).
+
+
 ## [2.6.0] - 2018-02-12
 ## Added
 - Adds support for a future LaunchDarkly feature, coming soon: semantic version user attributes.

src/main/java/com/launchdarkly/client/RedisFeatureStoreBuilder.java

@@ -16,7 +16,7 @@
  * {@link RedisFeatureStoreBuilder} calls can be chained, enabling the following pattern:
  *
  * <pre>
- * RedisFeatureStoreBuilder builder = new RedisFeatureStoreBuilder("host", 443, 60)
+ * RedisFeatureStore store = new RedisFeatureStoreBuilder("host", 443, 60)
  *      .refreshStaleValues(true)
  *      .asyncRefresh(true)
  *      .socketTimeout(200)