fixes #1255 and #1257 (3.2, 3.2.1 and trunk)

git-svn-id: https://svn.modelica.org/projects/Modelica/branches/maintenance/3.2.1@6954 7ce873d0-865f-4ce7-a662-4bb36ea78beb