Actualizations from Codeplex (revision 87566)