Code

Merge branch 'js/maint-1.6.0-path-normalize'