Merge remote-tracking branch 'origin/develop' into develop

src/components/views/avatars/RoomAvatar.js

@@ -177,6 +177,7 @@ module.exports = React.createClass({
     render: function() {
         const BaseAvatar = sdk.getComponent("avatars.BaseAvatar");
 
+        /*eslint no-unused-vars: ["error", { "ignoreRestSiblings": true }]*/
         const {room, oobData, viewAvatarOnClick, ...otherProps} = this.props;
 
         const roomName = room ? room.name : oobData.name;