reconnect activated (again again)
Merge branch 'master' of https://github.com/thornwishstalon/flaming-octo-nemesis