Sync changes from upstream repository
Merge pull request #3 from gjtorikian/update-1405529884