Include stdint
Merge branch 'master' into resize