Merge branch 'release-3.1'

Conflicts:
	webapp/components/create_comment.jsx

1 files changed, 1 insertions, 0 deletions

diff --git a/webapp/components/admin_console/multiselect_settings.jsx b/webapp/components/admin_console/multiselect_settings.jsx
index deba983de..ca0bdc9aa 100644
--- a/webapp/components/admin_console/multiselect_settings.jsx
+++ b/webapp/components/admin_console/multiselect_settings.jsx
@@ -50,6 +50,7 @@ export default class MultiSelectSetting extends React.Component {
                     labelKey='text'
                     options={this.props.values}
                     joinValues={true}
+                    clearable={false}
                     disabled={this.props.disabled}
                     noResultsText={this.props.noResultText}
                     onChange={this.handleChange}