Merge djangocms common