Merge branch 'js/maint-bisect-gitk'