Steve Murphy6bf874f330This commit merges the contents of 7721, as it applied to the trunk version. Added the item that would previously trigger a false error to test1.
6bf874f330
This commit merges the contents of 7721, as it applied to the trunk version. Added the item that would previously trigger a false error to test1.