branches crossed

[Stephen Mallette]

Looks like 3.5-dev is suddenly even with master. No idea how/when that
happened. Trying to figure it out, but if anyone knows what might have gone
wrong, please yell.