Merge branch 'js/untravis-windows'