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

CHANGELOG.md

@@ -6,7 +6,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
-### [2.22.0] - 2018-xx-xx
+### [2.22.2] - 2018-xx-xx
 - See https://github.com/nextcloud/ios/milestone/37
 
 ## [2.22.1] - 2018-08-21