Merge branch 'upnpn18' into 'next'

Fix compilation broken on latest miniupnpc version (resolves #1274)

Closes #1274

See merge request STJr/SRB2!2496