Merge from openmodelica branch.

This merge removes the use of the cardinality operator.