FeinCMS v1.9.5
Merge branch 'master' into next

* master:
  FeinCMS v1.9.5

Conflicts:
	feincms/__init__.py