Merge branch 'release/2.5.1'
Merge pull request #10 from plivius/github_cidr_checks

Github cidr checks
Retaining original config
Merge branch 'release/2.5.2'
Merge remote-tracking branch 'upstream/master'