revision 352 in latest/edge should have this fix in it.
We need to sort out pushing that to a stable branch and backporting to the 1.0 track
revision 352 in latest/edge should have this fix in it.
We need to sort out pushing that to a stable branch and backporting to the 1.0 track