Getting this in with the patch because it came through just as I was working on some final bugfixes
...
*Programs onward*