cleanup of weupnp code
Merge branch 'master' into cling