Custom entity doc typos.
Merge branch 'v1.2'