marked ocprop triggers
okapi r583: waypoint-related changes and fixes
table definition and translation fixes
okapi r590
merged master