Sync changes from upstream repository
Merge pull request #2 from gjtorikian/update-1405307441