Merge pull request #1003 from robertpi/Bug12211