Manually merge doc fixes from 1.3
5 files changed