HomePhorge

Merge pull request #3420 from elliefm/v35/3401-sync-server-bye