Sync changes from upstream repository
Merge pull request #1 from gjtorikian/update-1405035626