Long language codes take 2

New PR in place of the closed #906.  Includes a new commit that I want to see if fixes the problem for Jenkins.