Fix spelling typo.
Update upgrade instructions.
Revise override location.
Merge branch '1.3'