fix bug in skip_self_domain check
Merge branch 'master' into RELEASE_20140325