Motion fixes

Merged Sebastien Petitdemange requested to merge motion_fixes into master

Merge request reports