stuff
stuff
Merge branch 'stabilisation' of github.com:samuelstjean/dipy into stabilisation