Fix problem with url generation and nested admin in 'compose' related templates
Merge remote-tracking branch 'sonata-project/master'