jessek Merge pull request #361 from kraj/master