Merge branch 'js/patience-diff'