fixing bad variable references
Merge branch 'develop'.  Pulling in a patch for some undefined references.