Some minor cleaning up [ci skip].
Merge branch 'master' of github.com:opencor/opencor