Merge changes for OpenModelica