Fixes https://github.com/pahimar/Equivalent-Exchange-3/issues/532
Merge remote-tracking branch 'origin/master'