Merge branch 'develop-bugi025' into 'master'

Develop bugi025

Hi @rcruzgar
In order to follow up on the changes you did in develop-bugi025 the standard procedure is to open a merge request into master branch.
@pabretonniere how do you want to proceed for testing it before including it into master ?
@vsicardi needs this bug fix for going on with her experiment.
Regards

See merge request !13