Merge pull request #422 from authenticate/upstream

Attempting to Fix the Build Server