Merge remote-tracking branch 'origin/devel-0.5' into measurements
Merge remote-tracking branch 'origin/devel-0.5' into measurements
Merge branch 'measurements' into ivano/frog