Merge remote-tracking branch 'geodynamics/master' into morency_doin_material
Bugfix
Merge branch 'morency_doin_material'