Pulling from upstream.
Merge remote-tracking branch 'upstream/master' into retirement
Address details now in settings.
Merge pull request #351 from nodesocket/retirement

Address details in settings page.