updating to new domain scheme
Merge remote-tracking branch 'origin/0.3' into 0.3