Sync changes from upstream repository
Merge pull request #618 from github/update-1412900070