refs #1465: merge r7512, r7552 and r7567 from trunk

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