Merge remote-tracking branch 'upstream/develop' into ui_performance_fixes

.travis.yml

@@ -26,10 +26,7 @@ install:
 # node + npm + eslint
 - node --version
 - npm --version
-# Install NVM, see https://github.com/nvm-sh/nvm#installing-and-updating
-- curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash
-- export NVM_DIR="$HOME/.nvm"
-- [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
+- nvm --version
 - nvm install node
 - nvm use node
 - npm i -g eslint