Prepare release
Sync b8c99c2.
Merge branch '3.7'