Double var declaration fix for NailyFacts deploy
Merge pull request #534 from warpc/double_var_declaration

Double var declaration fix for NailyFacts deploy
Merge branch 'master' into ubuntu-3.2-WIP
Merge remote-tracking branch 'upstream/ubuntu-3.2-WIP' into ubuntu-3.2-WIP