Merge branch 'master' into feature/strong_self

# Conflicts:
#	xcode/.swiftlint.yml

xcode/.swiftlint.yml

@@ -251,6 +251,18 @@ custom_rules:
     message: "The parameter name is actually used in the function name. Use _ instead."
     severity: error
 
+  parameter_closure:
+    name: "Parameter closure"
+    regex: '\w*Closure<[^\r\n\t\f\v]*, Void[^\r\n\t\f\v]*>'
+    message: "Use `ParameterClosure` instead of declaring an explicit return value of `Void`."
+    severity: error
+
+  strong_self:
+    name: "Strong self"
+    regex: 'guard[\s\S]*= *self[\s\S]*else'
+    message: "Use a local function with `weak self` instead of `strong self`."
+    severity: error
+
   # Rx
 
   unused_map_parameter: