Merged from ThePirateBay edition (mr-orange)