FormulaEditor: Daily merge from master branch
FormulaEditor: Editor Tests
Merge TFS Changeset 1176