When compiled with "USE_UPNP=-", in "Options/Network" tab the "Map port using UPNP" checkbox is set up and disabled, which creates the impression that UPNP is always on.
This patch makes OptionModel to always return false is UPNP is disabled, which solves this checkbox problem and, IMHO, is much more intuitive behaviour overall.