Fixed #600: Defect - Custom DNS CNAME to CNAME - Trailing period
Merge branch 'upstream-master'