Fix for an incorrect merger of the 'disp_speed' branch.
Authored by: bugman 2014-05-29
Parent: [r23602]
Child: [r23604]