Resolved merge conflict.
Resolved merge conflict.

villalonreina/dipy,rfdougherty/dipy,beni55/dipy,StongeEtienne/dipy,Messaoud-Boudjada/dipy,sinkpoint/dipy,nilgoyyou/dipy,oesteban/dipy,jyeatman/dipy,demianw/dipy,rfdougherty/dipy,matthieudumont/dipy,demianw/dipy,FrancoisRheaultUS/dipy,beni55/dipy,sinkpoint/dipy,JohnGriffiths/dipy,mdesco/dipy,maurozucchelli/dipy,oesteban/dipy,samuelstjean/dipy,StongeEtienne/dipy,jyeatman/dipy,villalonreina/dipy,maurozucchelli/dipy,Messaoud-Boudjada/dipy,maurozucchelli/dipy,samuelstjean/dipy,matthieudumont/dipy,FrancoisRheaultUS/dipy,mdesco/dipy,samuelstjean/dipy,nilgoyyou/dipy,JohnGriffiths/dipy