Use a regex to avoid hard coding version branches
Merge pull request #1906 from dstufft/ugh

Use a regex to avoid hard coding version branches