2.6.0a1
Merge pull request #922 from asottile/2_6_0_a1

2.6.0a1