Comment From: sbrannen

This has been merged into 5.3.x and main (and slightly modified in d02d5adb5465d51885d374c55bce8bbb8dbd6279).

Thanks