Prepare release
Do not assume that `vendor-dir` is a directory called `vendor` for 3rd-party installs.
Merge branch '3.7'