Move the fix for LUN-1371 from django-robots to cms, where the fix seems to be more suitable due to the intrisic knowledge about cms internals.