fixing merge issue in latest version of Kevin's branch.
Merge branch 'kvnkeith'
Merge remote-tracking branch 'origin/master' into kvnkeith