Update to match p&p version from codeplex.