Merge branch 'develop' into blocker/JAL-3611_space_character_in_jalview_install_path