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