Merge remote-tracking branch 'Manuel/dorito' into dorito
Master Master
Merge remote-tracking branch 'antonio/dorito' into devel