Merge pull request #1403 from rouault/configure_guard_bits