Prepare for 0.9 merge window
Merge pull request #2713 from sipa/zerodotnine

Prepare for 0.9 merge window