Merge branch 'js/sideband-stderr'