Build #795:   Merge branch 'spork_guard' into wip on branch wip almost 7 years ago