Merge branch 'JAL-980_jmol_patch' into Release_2_7_Branch