merge 2.13.x branch onto master?

[SethTisue]

@lrytz should these stay separate branches, or should we do it on a single branch with version-specific sources?

[lrytz]

I haven't thought about that yet, I think version-specific sources works well here. Will take a look.