Fixed: Unable to add custom CNAME DNS resource record using the arobase symbol which is substitued by the zone root
Merge branch '1.1.x' into stable

Conflicts:
	CHANGELOG