Fix whitespace
Merge branch '3.7'