Merge pull request #2066 from hcwhan/master