Merge pull request #2949 from solgenomics/topic/fix_word_size