fix embarrassing compilation error
Merge branch 'master' into include_melt_transport