refs 1475: merged r7566 and r7569 from trunk

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