General: Categories and UPnP/NAT-PMP now optional
General: Bumped version to 0.5.8.5