master->origin, slave->replica
Merge pull request #1 from davidfetter/master

master->origin, slave->replica