update from git

git-tfs-id: [https://tfs.codeplex.com/tfs/tfs01]$/kettle/main;C102137
Merge commit '0afcaf86597f0be810b416ade43807a0f0bba8c7'