PRs

[Jonathan Gallimore]

Just a heads up that I merged in a couple of PRs from Doychin and Otavio.
They were green here, but I'll keep an eye on the build.

Jon