Merged from tfsbuildextensions:master