updated
Merge pull request #680 from optimizely/krush/plan-fixes

updated