Merge branch 'ss/travis-ci-force-vm-mode'