Refresh from TFS

Pull in changes from private TFS server