Merge in fix for GEARMAND_BINARY issue.