Merge branch 'coloquinte_rebase' into devel
Some merge conflicts did occurs as it seems the latests commits from "devel" where not applied to the rebase.
This commit is contained in:
commit
d258749373
Some merge conflicts did occurs as it seems the latests commits from "devel" where not applied to the rebase.