Merge pull request #580 from FiloSottile/master