Merge branch '2.0' into 2.1

# Conflicts:
#	client/dist/js/TinyMCE_sslink.js
#	client/dist/js/bundle.js
#	client/src/legacy/TinyMCE_sslink.js

client/src/containers/FormBuilderLoader/FormBuilderLoader.js

@@ -350,6 +350,7 @@ class FormBuilderLoader extends Component {
         return formSchema;
       })
       .catch((error) => {
+        this.setState({ didError: true });
         this.props.actions.schema.setSchemaLoading(this.props.schemaUrl, false);
         if (typeof this.props.onLoadingError === 'function') {
           return this.props.onLoadingError(this.normaliseError(error));
@@ -411,10 +412,13 @@ class FormBuilderLoader extends Component {
   }
 
   render() {
-    const Loading = this.props.loadingComponent;
+    if (this.state && this.state.didError) {
+      return null;
+    }
     // If the response from fetching the initial data
     // hasn't come back yet, don't render anything.
     if (!this.props.schema || !this.props.schema.schema || this.props.loading) {
+      const Loading = this.props.loadingComponent;
       return <Loading containerClass="loading--form flexbox-area-grow" />;
     }
 

client/src/legacy/TinyMCE_sslink-email.js

@@ -61,11 +61,7 @@ jQuery.entwine('ss', ($) => {
       const handleHide = () => this.close();
       const handleInsert = (...args) => this.handleInsert(...args);
       const attrs = this.getOriginalAttributes();
-      const editor = this.getElement().getEditor();
-      const selection = editor.getInstance().selection;
-      const selectionContent = editor.getSelection();
-      const tagName = selection.getNode().tagName;
-      const requireLinkText = tagName !== 'A' && selectionContent.trim() === '';
+      const requireLinkText = this.getRequireLinkText();
 
       // create/update the react component
       let root = this.getReactRoot();

client/src/legacy/TinyMCE_sslink-external.js

@@ -56,11 +56,7 @@ jQuery.entwine('ss', ($) => {
       const handleHide = () => this.close();
       const handleInsert = (...args) => this.handleInsert(...args);
       const attrs = this.getOriginalAttributes();
-      const editor = this.getElement().getEditor();
-      const selection = editor.getInstance().selection;
-      const selectionContent = editor.getSelection();
-      const tagName = selection.getNode().tagName;
-      const requireLinkText = tagName !== 'A' && selectionContent.trim() === '';
+      const requireLinkText = this.getRequireLinkText();
 
       // create/update the react component
       let root = this.getReactRoot();