Merge branch 'js/unzip-in-usr-bin-workaround'