Port over changes from codeplex to github.