Merge branch 'master' into develop

CHANGELOG.md

@@ -1,3 +1,10 @@
+Changes in [0.6.5-r2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.6.5-r2) (2016-09-02)
+=========================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.6.5-r1...v0.6.5-r2)
+
+ * Workaround vector-im/vector-web#2020 where floods of joins could crash the browser
+   (as seen in #matrix-dev right now)
+
 Changes in [0.6.5-r1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.6.5-r1) (2016-09-01)
 =========================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.6.5...v0.6.5-r1)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "0.6.5-r1",
+  "version": "0.6.5-r2",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

src/components/structures/TimelinePanel.js

@@ -32,7 +32,7 @@ var KeyCode = require('../../KeyCode');
 var PAGINATE_SIZE = 20;
 var INITIAL_SIZE = 20;
 
-var DEBUG = false;
+var DEBUG = true;
 
 if (DEBUG) {
     // using bind means that we get to keep useful line numbers in the console