Merge master in.

Author: calebd

CMDQueryStringSerialization/CMDQueryStringSerialization.m

@@ -20,9 +20,9 @@ + (NSDictionary *)dictionaryWithQueryString:(NSString *)string {
 
 + (NSString *)queryStringWithDictionary:(NSDictionary *)dictionary {
     CMDQueryStringWritingOptions options = (
-        CMDQueryStringWritingOptionArrayRepeatKeysWithBrackets |
-        CMDQueryStringWritingOptionDateAsUnixTimestamp
-    );
+                                            CMDQueryStringWritingOptionArrayRepeatKeysWithBrackets |
+                                            CMDQueryStringWritingOptionDateAsUnixTimestamp
+                                            );
     return [self queryStringWithDictionary:dictionary options:options];
 }
 

CMDQueryStringSerialization/NSString+CMDQueryStringSerialization.m

@@ -20,7 +20,7 @@ - (NSString *)cmd_stringByAddingEscapes {
 
 
 - (NSString *)cmd_stringByRemovingEscapes {
-    return [self stringByRemovingPercentEncoding];
+    return [self stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
 }
 
 @end