Merge pull request #418 from authenticate/upstream

Build Server Updates