Merge branch 'js/detached-stash'