merged from tamag_32
merged from tamag_32


Former-commit-id: 06097561ef33655872981dac38f07fc30829b7a8 [formerly ecefef2f67f54ff909383604c0d617f86d904580]
Former-commit-id: 723f9a13b7c7c6ee0aedf52d22e1adf6889ae037
Former-commit-id: b04d579a2e483f0161c11a1191aac6ca48571005
neuropoly/spinalcordtoolbox,neuropoly/spinalcordtoolbox,neuropoly/spinalcordtoolbox,neuropoly/spinalcordtoolbox,neuropoly/spinalcordtoolbox,neuropoly/spinalcordtoolbox,neuropoly/spinalcordtoolbox