FeinCMS v1.8.4
Try again
Merge branch 'master' into next

* master:
  Try again
  FeinCMS v1.8.4

Conflicts:
	feincms/__init__.py