in process

git-svn-id: https://192.168.1.201:8443/svn/EhlersDM@88 bab70dd1-25c2-d64e-b3e8-734d1e5f8854
pre-staging bug fixes

git-svn-id: https://192.168.1.201:8443/svn/EhlersDM@89 bab70dd1-25c2-d64e-b3e8-734d1e5f8854