Merge branch 'master' into jgrpp

# Conflicts:
#	src/console_cmds.cpp
#	src/landscape.cpp
#	src/linkgraph/linkgraphschedule.cpp
#	src/openttd.cpp
#	src/roadveh_cmd.cpp
#	src/toolbar_gui.cpp
#	src/train_cmd.cpp
#	src/vehicle.cpp
#	src/viewport.cpp
#	src/window_type.h

src/roadveh_cmd.cpp

@@ -36,6 +36,7 @@
 #include "infrastructure_func.h"
 #include "newgrf.h"
 #include "zoom_func.h"
+#include "framerate_type.h"
 #include "scope_info.h"
 #include "string_func.h"
 
@@ -1664,6 +1665,8 @@ Money RoadVehicle::GetRunningCost() const
 
 bool RoadVehicle::Tick()
 {
+	PerformanceAccumulator framerate(PFE_GL_ROADVEHS);
+
 	this->tick_counter++;
 
 	if (this->IsFrontEngine()) {