Merge branch 'js/completion-ctags-pattern-substitution-fix' into maint