Fix build on x64 systems.
Merge branch 'master' into single_image