Merge "Allow for 5400 words in dump-words-to-file" into nyc-dev