sync with current development

git-svn-id: https://192.168.1.201:8443/svn/EhlersDM@45 bab70dd1-25c2-d64e-b3e8-734d1e5f8854
sync with current development

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