Merge pull request #1 from SupSuper/master

Backporting
Merge remote-tracking branch 'upstream/master'

Backport.
Merge pull request #2 from SupSuper/master

Backporting
Add missing Xcode build files

Turns out some files didn’t make it into the repo with the initial push
due to specific .gitignore restrictions.
Merge pull request #848 from luciderous/master

Add missing Xcode build files