Manually merge #862
Merge branch 'IratePirate-Bleeding-Edge' into Bleeding-Edge