Chapter 7: Some improvements
Merge branch '3.0' into 3.1