Fix body display bug.
v2.6.2
Merge remote-tracking branch 'upstream/master' into project-site