Merged documentation fix from 3.2.