issue_501_sync
Merge pull request #634 from jac1013/issue_501_sync

#634: pull request issue_501_sync
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into 268