Ottocar_reset Node
Merge branch 'origin/master'