Merge branch 'master' of github.com:matrix-org/synapse into develop

CHANGES.rst

@@ -41,7 +41,6 @@ Webclient:
  * The recents list now differentiates between public & private rooms.
  * Fix bug where when switching between rooms the pagination flickered before
    the view jumped to the bottom of the screen.
- * Add support for password resets.
  * Add bing word support.
 
 Registration API:

webclient/components/matrix/matrix-call.js

@@ -537,7 +537,7 @@ angular.module('MatrixCall', [])
         }
 
         if (this.candidateSendTries > 5) {
-            console.log("Failed to send candidates on attempt "+ev.tries+". Giving up for now.");
+            console.log("Failed to send candidates on attempt "+this.candidateSendTries+". Giving up for now.");
             this.candidateSendTries = 0;
             return;
         }