ksonney/ggautoblocker — pull request #2 by ksonney (2014-12-02 17:33:57+00:00)
Title: Re-sync to upsteam

re-sync latest changes from upstream