Normalize trunk code by default.
2.7.0