merge upstream
Merge pull request #361 from parrt/master

ooops; these got deleted but now they are back.