Update to upstream version 4.90 plus fixes to connection wizard and some cleanup.