Update js to match upstream/master