Merge "Re-enable npm deploy"