Doc improvements merged into 3.2.x branch