Merge branch 'develop' into luke/fix-rte-strikeout

src/components/structures/UserSettings.js

@@ -656,7 +656,7 @@ module.exports = React.createClass({
                     <table>
                         <tbody>
                         <tr>
-                            <td><strong>Autocomplete Delay (ms): </strong></td>
+                            <td><strong>{_t('Autocomplete Delay (ms):')}</strong></td>
                             <td>
                                 <input
                                     type="number"

src/components/views/login/PasswordLogin.js

@@ -69,10 +69,19 @@ class PasswordLogin extends React.Component {
 
     onSubmitForm(ev) {
         ev.preventDefault();
+        if (this.state.loginType === PasswordLogin.LOGIN_FIELD_PHONE) {
+            this.props.onSubmit(
+                '', // XXX: Synapse breaks if you send null here:
+                this.state.phoneCountry,
+                this.state.phoneNumber,
+                this.state.password,
+            );
+            return;
+        }
         this.props.onSubmit(
             this.state.username,
-            this.state.phoneCountry,
-            this.state.phoneNumber,
+            null,
+            null,
             this.state.password,
         );
     }