Merge pull request #3762
93c3e21 Re-enable UPnP by default in gitian builds (Wladimir J. van der Laan)