Merge branch 'master' into 1598876

Author: gvn

.travis.yml

@@ -20,6 +20,7 @@ before_install:
   - "export DISPLAY=:99.0"
   - "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16 -extension RANDR"
   - export PATH="$PATH:$HOME/.rvm/bin"
+  - export PATH="$PATH:./node_modules/.bin"
   - sleep 3
 
 install: