merged master into billing and resolved conflicts
Merge pull request #959 from lynnaloo/billing

Merge master into billing without conflicts
Merge remote-tracking branch 'XTUPLE/billing' into 21587