Merge branch 'develop' into rav/travis

jenkins.sh

@@ -4,7 +4,7 @@ set -e
 
 export NVM_DIR="/home/jenkins/.nvm"
 [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"
-nvm use 4
+nvm use 6
 
 set -x
 

src/components/views/dialogs/ChangelogDialog.js

@@ -16,7 +16,6 @@
 
 import React from 'react';
 import sdk from 'matrix-react-sdk';
-import 'whatwg-fetch';
 import request from 'browser-request';
 
 const REPOS = ['vector-im/vector-web', 'matrix-org/matrix-react-sdk', 'matrix-org/matrix-js-sdk'];