Code

Merge branch 'js/maint-1.6.1-remote-remove-mirror' into maint-1.6.1