Push commit 34104:
http://bbimagehandler.codeplex.com/SourceControl/changeset/34104