Merge pull request #1279 from mcnewton/ch30x