Refactored to not mix anchor_safe_urljoin with regular urljoin and use it only when necessary.
Refactored to not mix anchor_safe_urljoin with regular urljoin and use it only when necessary.

huubbouma/diazo,huubbouma/diazo,ebrehault/diazo,ebrehault/diazo,ebrehault/diazo,huubbouma/diazo