Merge branch 'release/0.6.2' into develop
Update README for the new multi-server behavior.
Merge branch 'develop'