Rebase with upstream#2

dfbernal wants to merge 6 commits intomasterTCGplayer/jackdaw:masterfrom

rebase-with-upstreamTCGplayer/jackdaw:rebase-with-upstreamCopy head branch name to clipboard