Re-apply PR https://github.com/sillsdev/libpalaso/pull/890
Re-apply PR https://github.com/sillsdev/libpalaso/pull/890


ermshiperete/libpalaso,ermshiperete/libpalaso,sillsdev/libpalaso,ermshiperete/libpalaso,gmartin7/libpalaso,sillsdev/libpalaso,gmartin7/libpalaso,ermshiperete/libpalaso,sillsdev/libpalaso,gmartin7/libpalaso,sillsdev/libpalaso,gmartin7/libpalaso