Fix whitespace in recent commits.
Update contrib modules snapshot.