Merge remote-tracking branch 'upstream/master' into fix/web-driver-tests-v8

Conflicts:
	src/styles/index.scss

src/components/layers/LayerEditorGroup.jsx

@@ -23,7 +23,9 @@ export default class LayerEditorGroup extends React.Component {
         <Collapser isCollapsed={this.props.isActive} />
       </div>
       <Collapse isOpened={this.props.isActive}>
-        {this.props.children}
+        <div className="react-collapse-container">
+          {this.props.children}
+        </div>
       </Collapse>
     </div>
   }