Merge pull request #1 from gkz/master

Upstream changes
Happy New Year
fix testing
Merge remote-tracking branch 'upstream/master' into removematch
Merge remote-tracking branch 'origin/master' into removematch