Merge branch 'features/JAL-2177_update_jmol_to_14.6.4_2016.10.26' into develop