When we return, stop using a VM to test ST3. We can use an environment variable and be muuuch more comfortable
Merge remote-tracking branch 'origin/master'