Sync with #828.
Simplify travis config.
Use the correct version of `php-invoker`.
Made #844 work for isolated tests.
Merge branch '3.7'