Slight improvement to b9ea952.
Merge branch '3.7'