Merge pull request #1 from pyserial/master

Catch up to the main fork