Sync velocity fixes

This is the same pull request as https://github.com/Famous/famous/pull/457, but targeting develop instead of master.