Fixed FormulaEditor
Merge TFS Changeset 1409