Sync changes from upstream repository
Merge pull request #593 from github/update-1409690124
Merge pull request #2 from github/master

Sync changes from upstream repository