Merge pull request #545 from FiloSottile/alias