Any chance you could slip that into this commit? It'd be much appreciated to help with bugs filed when this gets QAed.