Add an empty block just before the fieldsets so one can easily add some controls here.
Implement the admin_urlname protocol on ContentModelMixin to make it easier to generate an admin_url to a base content.
Merge branch 'next' into tabbed_options