Merge branch 'js/iterm-is-on-osx'