Merged Annex60.

This merges https://github.com/iea-annex60/modelica-annex60/commit/933499fefc3657f372930be8e1c9ea8a5889127b