Fixes Bug 681
Also fixed some spelling issues in the documentation

--HG--
branch : 3.2
extra : source : f9490fb8eb1efa1fa08b5bc62e8888cf0eb89cfe