96310f Merge remote-tracking branch 'upstream/master' into duplicatePaste

Merged and Committed by Jeremy Bullock 5 years ago
    Merge remote-tracking branch 'upstream/master' into duplicatePaste