Issue #302: Allow rendering via a view mode.
Merge branch '7.x-1.x' into 303-document-view-modes
Issue #303: Minor changes.