Gittrac #2380:  Committing some diagnostic code on the branch.