legends (broken)
Merge remote-tracking branch 'refs/remotes/upstream/master' into widget-refactor
Removed DS_Store files and added a .gitignore that ignores them in the future (as well as some other things)