diff --git a/.travis.yml b/.travis.yml
index 61021b4e4..07fc0efbd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,30 +5,30 @@ matrix:
       os: linux
       env: SWIGLANG=
       sudo: required
-      dist: trusty
+      dist: xenial
     - compiler: gcc
       os: linux
       env: SWIGLANG=
       sudo: required
-      dist: trusty
+      dist: xenial
     - os: linux
       env: SWIGLANG= SWIG_CC=gcc-5 SWIG_CXX=g++-5 CPP11=1
       sudo: required
-      dist: trusty
+      dist: xenial
     - os: linux
       env: SWIGLANG= SWIG_CC=gcc-6 SWIG_CXX=g++-6
       sudo: required
-      dist: trusty
+      dist: xenial
     - compiler: gcc
       os: linux
       env: SWIGLANG=csharp
       sudo: required
-      dist: trusty
+      dist: xenial
     - compiler: gcc
       os: linux
       env: SWIGLANG=d
       sudo: required
-      dist: trusty
+      dist: xenial
     - compiler: gcc
       os: linux
       env: SWIGLANG=go VER=1.3
@@ -48,72 +48,72 @@ matrix:
       os: linux
       env: SWIGLANG=guile
       sudo: required
-      dist: trusty
+      dist: xenial
     - compiler: gcc
       os: linux
       env: SWIGLANG=java
       sudo: required
-      dist: trusty
+      dist: xenial
     - compiler: gcc
       os: linux
-      env: SWIGLANG=javascript ENGINE=node
+      env: SWIGLANG=javascript ENGINE=node VER=0.10
       sudo: required
-      dist: trusty
+      dist: xenial
     - compiler: gcc
       os: linux
       env: SWIGLANG=javascript ENGINE=node VER=4 CPP11=1
       sudo: required
-      dist: trusty
+      dist: xenial
     - compiler: gcc
       os: linux
       env: SWIGLANG=javascript ENGINE=node VER=6 CPP11=1
       sudo: required
-      dist: trusty
+      dist: xenial
     - compiler: gcc
       os: linux
       env: SWIGLANG=javascript ENGINE=node VER=8 CPP11=1
       sudo: required
-      dist: trusty
+      dist: xenial
     - compiler: gcc
       os: linux
       env: SWIGLANG=javascript ENGINE=node VER=10 CPP11=1
       sudo: required
-      dist: trusty
+      dist: xenial
     - compiler: gcc
       os: linux
       env: SWIGLANG=javascript ENGINE=jsc
       sudo: required
-      dist: trusty
+      dist: xenial
     - compiler: gcc
       os: linux
       env: SWIGLANG=javascript ENGINE=v8
       sudo: required
-      dist: trusty
+      dist: xenial
     - compiler: gcc
       os: linux
       env: SWIGLANG=lua
       sudo: required
-      dist: trusty
+      dist: xenial
     - compiler: gcc
       os: linux
       env: SWIGLANG=lua VER=5.3
       sudo: required
-      dist: trusty
+      dist: xenial
     - compiler: gcc
       os: linux
       env: SWIGLANG=mzscheme
       sudo: required
-      dist: trusty
+      dist: xenial
     - compiler: gcc
       os: linux
       env: SWIGLANG=ocaml
       sudo: required
-      dist: trusty
+      dist: xenial
     - compiler: gcc
       os: linux
       env: SWIGLANG=octave SWIGJOBS=-j2 # 3.8
       sudo: required
-      dist: trusty
+      dist: xenial
     - compiler: gcc
       os: linux
       env: SWIGLANG=octave SWIGJOBS=-j2 VER=4.0
@@ -133,17 +133,17 @@ matrix:
       os: linux
       env: SWIGLANG=perl5
       sudo: required
-      dist: trusty
+      dist: xenial
     - compiler: gcc
       os: linux
       env: SWIGLANG=php VER=7.0
       sudo: required
-      dist: trusty
+      dist: xenial
     - compiler: gcc
       os: linux
       env: SWIGLANG=php VER=7.1
       sudo: required
-      dist: trusty
+      dist: xenial
     - compiler: gcc
       os: linux
       env: SWIGLANG=php VER=7.2
@@ -153,110 +153,110 @@ matrix:
       os: linux
       env: SWIGLANG=php VER=7.3
       sudo: required
-      dist: trusty
+      dist: xenial
     - compiler: gcc
       os: linux
       env: SWIGLANG=python # 2.7
       sudo: required
-      dist: trusty
+      dist: xenial
     - compiler: gcc
       os: linux
       env: SWIGLANG=python PY3=3 VER=3.2
       sudo: required
-      dist: trusty
+      dist: xenial
     - compiler: gcc
       os: linux
       env: SWIGLANG=python PY3=3 VER=3.3
       sudo: required
-      dist: trusty
+      dist: xenial
     - compiler: gcc
       os: linux
       env: SWIGLANG=python PY3=3 VER=3.4
       sudo: required
-      dist: trusty
+      dist: xenial
     - compiler: gcc
       os: linux
       env: SWIGLANG=python PY3=3 VER=3.5
       sudo: required
-      dist: trusty
+      dist: xenial
     - compiler: gcc
       os: linux
       env: SWIGLANG=python PY3=3 VER=3.6
       sudo: required
-      dist: trusty
+      dist: xenial
     - compiler: gcc
       os: linux
       env: SWIGLANG=python PY3=3 VER=3.7
       sudo: required
-      dist: trusty
+      dist: xenial
     - compiler: gcc
       os: linux
       env: SWIGLANG=python SWIG_FEATURES=-builtin
       sudo: required
-      dist: trusty
+      dist: xenial
     - compiler: gcc
       os: linux
       env: SWIGLANG=python SWIG_FEATURES="-builtin -O"
       sudo: required
-      dist: trusty
+      dist: xenial
     - os: linux
       env: SWIGLANG=python SWIG_FEATURES=-builtin SWIG_CC=gcc-6 SWIG_CXX=g++-6 CPP11=1
       sudo: required
-      dist: trusty
+      dist: xenial
     - os: linux
       env: SWIGLANG=python SWIG_FEATURES=-builtin SWIG_CC=gcc-6 SWIG_CXX=g++-6 CPP11=1 PY3=3 VER=3.7
       sudo: required
-      dist: trusty
+      dist: xenial
     - compiler: gcc
       os: linux
       env: SWIGLANG=python SWIG_FEATURES=-builtin PY3=3 VER=3.4
       sudo: required
-      dist: trusty
+      dist: xenial
     - compiler: gcc
       os: linux
       env: SWIGLANG=python SWIG_FEATURES=-builtin PY3=3 VER=3.5
       sudo: required
-      dist: trusty
+      dist: xenial
     - compiler: gcc
       os: linux
       env: SWIGLANG=python SWIG_FEATURES=-builtin PY3=3 VER=3.7
       sudo: required
-      dist: trusty
+      dist: xenial
     - compiler: gcc
       os: linux
       env: SWIGLANG=python SWIG_FEATURES="-builtin -O" PY3=3 VER=3.7
       sudo: required
-      dist: trusty
+      dist: xenial
     - compiler: gcc
       os: linux
       env: SWIGLANG=python SWIG_FEATURES=-builtin PY3=3 VER=3.7 SWIGOPTPY3=
       sudo: required
-      dist: trusty
+      dist: xenial
     - compiler: gcc
       os: linux
       env: SWIGLANG=python SWIG_FEATURES=-O
       sudo: required
-      dist: trusty
+      dist: xenial
     - compiler: gcc
       os: linux
       env: SWIGLANG=python SWIG_FEATURES=-O PY3=3 VER=3.7
       sudo: required
-      dist: trusty
+      dist: xenial
     - compiler: gcc
       os: linux
       env: SWIGLANG=r
       sudo: required
-      dist: trusty
+      dist: xenial
     - compiler: gcc
       os: linux
       env: SWIGLANG=ruby VER=1.9.3
       sudo: required
-      dist: trusty
+      dist: xenial
     - compiler: gcc
       os: linux
       env: SWIGLANG=ruby VER=2.0.0
       sudo: required
-      dist: trusty
+      dist: xenial
     - compiler: gcc
       os: linux
       env: SWIGLANG=ruby VER=2.3.0
@@ -271,11 +271,11 @@ matrix:
       os: linux
       env: SWIGLANG=tcl
       sudo: required
-      dist: trusty
+      dist: xenial
     - os: linux
       env: SWIGLANG=csharp SWIG_CC=gcc-5 SWIG_CXX=g++-5 CPP11=1
       sudo: required
-      dist: trusty
+      dist: xenial
     - os: linux
       env: SWIGLANG=go SWIG_CC=gcc-5 SWIG_CXX=g++-5 CPP11=1
       sudo: required
@@ -283,27 +283,27 @@ matrix:
     - os: linux
       env: SWIGLANG=java SWIG_CC=gcc-5 SWIG_CXX=g++-5 CPP11=1
       sudo: required
-      dist: trusty
+      dist: xenial
     - os: linux
       env: SWIGLANG=python SWIG_CC=gcc-5 SWIG_CXX=g++-5 CPP11=1
       sudo: required
-      dist: trusty
+      dist: xenial
     - os: linux
       env: SWIGLANG=r CPP11=1 # Note: making 'R CMD SHLIB' use a different compiler is non-trivial
       sudo: required
-      dist: trusty
+      dist: xenial
     - os: linux
       env: SWIGLANG=ruby SWIG_CC=gcc-5 SWIG_CXX=g++-5 CPP11=1
       sudo: required
-      dist: trusty
+      dist: xenial
     - os: linux
       env: SWIGLANG=tcl SWIG_CC=gcc-5 SWIG_CXX=g++-5 CPP11=1
       sudo: required
-      dist: trusty
+      dist: xenial
     - os: linux
       env: SWIGLANG=csharp SWIG_CC=gcc-6 SWIG_CXX=g++-6 CPP14=1
       sudo: required
-      dist: trusty
+      dist: xenial
     - os: linux
       env: SWIGLANG=go SWIG_CC=gcc-6 SWIG_CXX=g++-6 CPP14=1
       sudo: required
@@ -311,39 +311,39 @@ matrix:
     - os: linux
       env: SWIGLANG=java SWIG_CC=gcc-6 SWIG_CXX=g++-6 CPP14=1
       sudo: required
-      dist: trusty
+      dist: xenial
     - os: linux
       env: SWIGLANG=python SWIG_CC=gcc-6 SWIG_CXX=g++-6 CPP14=1
       sudo: required
-      dist: trusty
+      dist: xenial
     - os: linux
       env: SWIGLANG=ruby SWIG_CC=gcc-6 SWIG_CXX=g++-6 CPP14=1
       sudo: required
-      dist: trusty
+      dist: xenial
     - os: linux
       env: SWIGLANG=tcl SWIG_CC=gcc-6 SWIG_CXX=g++-6 CPP14=1
       sudo: required
-      dist: trusty
+      dist: xenial
     - os: linux
       env: SWIGLANG=java SWIG_CC=gcc-7 SWIG_CXX=g++-7 CPP14=1
       sudo: required
-      dist: trusty
+      dist: xenial
     - os: linux
       env: SWIGLANG=python SWIG_CC=gcc-7 SWIG_CXX=g++-7 CPP14=1
       sudo: required
-      dist: trusty
+      dist: xenial
     - os: linux
       env: SWIGLANG=csharp SWIG_CC=gcc-8 SWIG_CXX=g++-8 CPP17=1
       sudo: required
-      dist: trusty
+      dist: xenial
     - os: linux
       env: SWIGLANG=java SWIG_CC=gcc-8 SWIG_CXX=g++-8 CPP17=1
       sudo: required
-      dist: trusty
+      dist: xenial
     - os: linux
       env: SWIGLANG=python SWIG_CC=gcc-8 SWIG_CXX=g++-8 CPP17=1 PY3=3 VER=3.7
       sudo: required
-      dist: trusty
+      dist: xenial
     - compiler: gcc
       os: osx
       env: SWIGLANG=
@@ -393,12 +393,12 @@ matrix:
       os: linux
       env: SWIGLANG=mzscheme
       sudo: required
-      dist: trusty
+      dist: xenial
     - compiler: gcc
       os: linux
       env: SWIGLANG=ocaml
       sudo: required
-      dist: trusty
+      dist: xenial
 
 before_install:
   - date -u
diff --git a/Tools/travis-linux-install.sh b/Tools/travis-linux-install.sh
index bfa7bf8eb..b801e2b00 100755
--- a/Tools/travis-linux-install.sh
+++ b/Tools/travis-linux-install.sh
@@ -44,14 +44,15 @@ case "$SWIGLANG" in
 	"javascript")
 		case "$ENGINE" in
 			"node")
-				if [[ -z "$VER" ]]; then
-					travis_retry sudo apt-get install -qq nodejs node-gyp
+				travis_retry wget -qO- https://raw.githubusercontent.com/creationix/nvm/v0.33.10/install.sh | bash
+				export NVM_DIR="$HOME/.nvm"
+				[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+				travis_retry nvm install ${VER}
+				nvm use ${VER}
+				if [ "$VER" == "0.10" ] || [ "$VER" == "0.12" ] ; then
+#					travis_retry sudo apt-get install -qq nodejs node-gyp
+					travis_retry npm install -g node-gyp@$VER
 				else
-					travis_retry wget -qO- https://raw.githubusercontent.com/creationix/nvm/v0.33.10/install.sh | bash
-					export NVM_DIR="$HOME/.nvm"
-					[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
-					travis_retry nvm install ${VER}
-					nvm use ${VER}
 					travis_retry npm install -g node-gyp
 				fi
 				;;
@@ -70,8 +71,6 @@ case "$SWIGLANG" in
 		if [[ -z "$VER" ]]; then
 			travis_retry sudo apt-get -qq install lua5.2 liblua5.2-dev
 		else
-			travis_retry sudo add-apt-repository -y ppa:ubuntu-cloud-archive/mitaka-staging
-			travis_retry sudo apt-get -qq update
 			travis_retry sudo apt-get -qq install lua${VER} liblua${VER}-dev
 		fi
 		;;
@@ -79,8 +78,7 @@ case "$SWIGLANG" in
 		travis_retry sudo apt-get -qq install racket
 		;;
 	"ocaml")
-		# configure also looks for ocamldlgen, but this isn't packaged.  But it isn't used by default so this doesn't matter.
-		travis_retry sudo apt-get -qq install ocaml ocaml-findlib
+		travis_retry sudo apt-get -qq install ocaml camlp4
 		;;
 	"octave")
 		if [[ -z "$VER" ]]; then