Merge branch 'bug/JAL-4020_add_pymolwin_paths' into develop