Fix merge conflicts in pulling doc fixes from 0.13.1 into 0.13 branch.
Merge pull request #1154 from sbt/wip/merge-0.13.1-to-0.13

Merge doc fixes from 0.13.1 into 0.13 branch.