I think we're ready to merge here. I'd like to merge asap after 1.38 is out.
Agree, I've been using this since my comments above with no problem (but Geany use is limited) and then we can test the upgrade process by going to 5.1.2
And thanks for doing it.