Master

Merged bgm requested to merge github/fork/eileenmcnaughton/master into master

Created by: eileenmcnaughton

CRM-17388 Fix auto-discounts not being applied to memberships

Merge request reports