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