Reapplying uncommitted fixes.
Merge remote-tracking branch 'origin/staging' into staging

Conflicts:
	maestro/src/Trajectory.cpp