Merge branch 'js/diffstat'