Merge remote-tracking branch 'upstream/master'

Conflicts:
	cmsplugin_zinnia/admin.py
Merge branch 'master' of https://github.com/cwilhelm/cmsplugin-zinnia