Merge branch 'master' into migration-guide

# Conflicts:
#	package-lock.json

client/homebrew/editor/editor.jsx

@@ -208,6 +208,7 @@ const Editor = createClass({
 					view={this.state.view}
 					value={this.props.brew.style ?? DEFAULT_STYLE_TEXT}
 					onChange={this.props.onStyleChange}
+					enableFolding={false}
 					rerenderParent={this.rerenderParent} />
 			</>;
 		}