Missing some updates that were supposed to be included in previous commit
Merge pull request #3 from ccpgames/master

Update from upstream