Merge pull request #1 from d3athrow/Bleeding-Edge

Bleeding edge
Merge remote-tracking branch 'upstream/Bleeding-Edge' into Bleeding-Edge
fixing corgi-related runtime error
Merge pull request #1673 from DeityLink/corgi-runtimefix

!(URGENT)! Corgi Runtime-Error fix