Last commit 98289 from http://avalondock.codeplex.com