Upstream merge of mr-orange/Sick-Beard/ThePirateBay