Completed Guard-Spork merge
Merged spork-guard