Merged with upstream master, added DS_Store to .gitignore.