proper way to grab stage variable
Merge branch 'release-2014-10-03' into release-2014-10-17