rebase on top of master
rebase on top of master

villalonreina/dipy,StongeEtienne/dipy,matthieudumont/dipy,matthieudumont/dipy,StongeEtienne/dipy,nilgoyyou/dipy,JohnGriffiths/dipy,villalonreina/dipy,FrancoisRheaultUS/dipy,nilgoyyou/dipy,FrancoisRheaultUS/dipy,JohnGriffiths/dipy