Fixed on trunk via check-in [749d5af8d3197c94].  This fix will appear in the
release.