Update VS2010 project after EnumString changes
Merge branch 'ui-textlayout-optimisation'