Merge upstream changes into fancybits branch#1

eric wants to merge 1 commit intofancybitsfancybits/Comskip:fancybitsfrom

fancybits-upstream-merge-mar2020fancybits/Comskip:fancybits-upstream-merge-mar2020Copy head branch name to clipboard