Reorder blog and accounts patterns in mezzanine.urls to allow for projects with a blog homepage that also have accounts enabled.
Merge remote-tracking branch 'upstream/master' into inheritance-manager
Fix handling of paths in zip imports in galleries app.
Norwegian translation string with < and > characters break page editing.
Merge remote-tracking branch 'upstream/master' into inheritance-manager