Merge remote-tracking branch 'origin/dev' into cookbook-sonata

Conflicts:
	cookbook/handling_multilang_documents.rst