Update to upsteam version 1.0.4

THIS IS A DRAFT. THE UPGRADE IS STILL UNDER TEST. I'LL REMOVE THIS LINE AS SOON AS IT HAS PASSED.

See <https://issues.adblockplus.org/ticket/772>.