Issue #1034828 by Steven Jones, Bladedu, brunodbo | Rob C: Fixed 'No active batch' error after user cancelling own account.
Issue #2031319 by jlindsey15, pplantinga, thedavidmeister, Kingdutch, Kiphaas7: Document that theme() should really be called via drupal_render().
Merge remote-tracking branch 'upstream/7.x' into 7.x-stackato