Merge openmodelica branch