patch 6061 (spelling) merged from the trunk