Add changes from 2014.01.29
vs2010 fixes.