Fix typo: doens't > doesn't
Merge and fix conflicts.
Updated the return values (comments/docs) of a couple of methods.
Merge branch '4.1'