Fix issue #1275 - one more missing check.
Update buildbot scripts and add 64-bit buildbot
Merge commit 'ce9f1e1' into merge3