Merge fixes for OpenModelica to OpenModelica development branch.