Merge remote-tracking branch 'upstream/master'
Fix the polyobject crash
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'Sryder13/master'