Automated merge with https://code.gocept.com/hg/public/zeit.cms
Automated merge with https://code.gocept.com/hg/public/zeit.cms

ZeitOnline/zeit.cms,ZeitOnline/zeit.cms,ZeitOnline/zeit.cms,ZeitOnline/zeit.cms