REF: trying to merge...
Merge branch 'master' of https://github.com/neuropoly/spinalcordtoolbox

Conflicts:
	scripts/sct_convert.py