master I from newch5branching -> vs2010 project