Merge pull request #335 from rogpeppe/024-merge-devel

merge devel into v2