Updating with the latest changes in production.
Committing production specific changes
Merge branch '7.x-4.2.6-1.0-prod' of github.com:aar/civicrm_multi_payments into 7.x-4.2.6-1.0-prod
Merge remote-tracking branch 'remotes/origin/7.x-4.2.6-1.x-oasis-549' into 7.x-4.2.6-2.x
Adding logic to handle expired membership that can accomodate memberships from other records. aar/OASIS#577 and aar/OASIS#576
Merge branch '7.x-4.2.6-oasis-577' into 7.x-4.2.6-1.x