Merge master to openmodelica branch.