Pull of TFS-master

Please accept the pull request to continue the update.