linux needs the stdint.h for uint64_t
Merge branch 'Maintenance' into develop