Merge branch 'develop' into features/JAL-2295setChimeraAttributes

Conflicts:
	src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java

diff --cc src/ext/edu/ucsf/rbvi/strucviz2/ChimeraManager.java
Simple merge

diff --cc src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
index 1ff0466,262b8a2..75ddc9c
--- 1/src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
--- 2/src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
+++ b/src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
@@@ -287,8 -318,13 +320,12 @@@ public abstract class JalviewChimeraBin
        chimeraListener.shutdown();
        chimeraListener = null;
      }
 -    lastCommand = null;
      viewer = null;
  
+     if (chimeraMonitor != null)
+     {
+       chimeraMonitor.interrupt();
+     }
      releaseUIResources();
    }
  

diff --cc src/jalview/gui/JalviewChimeraBindingModel.java
Simple merge