Merge pull request #1234 from some/long/branch/name/that/pushes/past/normal/limits