rev master to 1.9.x
Merge pull request #83 from candlepin/alikins/rev_master_1.9

rev master to 1.9.x