Fix/drunken navigation

Merged Florian Polster requested to merge fix/drunken_navigation into master

Merge request reports