Merge tag 'v0.9.4' into develop

Finish hotfix_Riot_2715

# Conflicts:
#	CHANGES.rst

Riot/Modules/Home/Fallback/AuthFallBackViewController.h

@@ -0,0 +1,40 @@
+/*
+ Copyright 2019 New Vector Ltd
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+#import "WebViewViewController.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@class AuthFallBackViewController;
+@protocol AuthFallBackViewControllerDelegate
+
+- (void)authFallBackViewController:(AuthFallBackViewController*)authFallBackViewController didLoginWithLoginResponse:(MXLoginResponse*)loginResponse;
+- (void)authFallBackViewControllerDidClose:(AuthFallBackViewController*)authFallBackViewController;
+
+@end
+
+
+/**
+ `AuthFallBackViewController` handles the display of a Matrix fallback URL for
+ login, registration and Single-Sign-On.
+ */
+@interface AuthFallBackViewController : WebViewViewController
+
+@property (nonatomic, weak, nullable) id<AuthFallBackViewControllerDelegate> delegate;
+
+@end
+
+NS_ASSUME_NONNULL_END