Fixed on trunk by check-in [16f09dbc53].  The fix will be included in the next
release, due out sometime within the next month.