Adding back short ID generation changes (lost via merge)
Merge branch 'master' of https://github.com/mrchief/rustflakes into develop

Fixing UInt64Oxidation ID generation bug