Fixed a sign error.  There are still a lot of issues with speed scaling.
Merge remote-tracking branch 'upstream/master'