Reformatted code
Merge branch 'master' into openmodelica