Add in all March 2013 fixes from K2 SVN