Fix implicit discount_fallback to be a vector of strings
Merge remote-tracking branch 'upstream/master'