.
Merge remote-tracking branch 'upstream/master'
No prorata billingRule
Merge pull request #203 from Ranjith15/master

No Prorata BillingRule