[GayTorrents] Backport from master
Merge pull request #344 from reedy/GTBackport-01072014

[GayTorrents] Backport from master