Update version to reflect what we are running
Merge branch 'develop' into clustered_login_server
Finish implementation of https://www.pivotaltracker.com/story/show/57817784