Merge pull request #4509 from colemanw/addVars