Merge branch 'feature/complex-inheritance' into develop

Conflicts:
	modeltranslation/management/commands/update_translation_fields.py