nao fixes, visp tracker
Merge branch 'stage-devel' of https://github.com/ecervera/r3po into stage-devel