Sync changes from upstream repository
Merge pull request #619 from github/update-1413487774
Sync changes from upstream repository
Merge pull request #621 from github/update-1413817590
Sync changes from upstream repository
Merge pull request #622 from github/update-1413838478
Merge pull request #9 from github/master

Sync changes from upstream repository