Fixed on trunk via check-in [10da1211e5].