Importing 32-bit timestamp fix from kieranmather/gmbustimes