Use stdint typedefs; Add format specifier for unsigned long long int for uint64_t.
Merge branch 'develop' into master