This is unchanged since the most recent commit, as the bugfix from #6181 only fixes a bug introduced since 1.9.0.dev1. Accordingly, I will merge this change tomorrow morning unless someone says it's ok to do it earlier.