Yes, my bad, there were merge conflicts in that file which I resolved without rebase so that github would pick up both issues (and auto merge them).  I also (foolishly and mistakenly) tried to fix the deprecation I noticed; I backed that out in master.