mozilla/browserid — pull request #3190 by 6a68 (2013-04-03 22:43:57+00:00)
Title: Train 2013.03.29  add underscore fix

Cherry-picking the contents of #3168 into the current train. @jrgm have at it. Diffs look identical to me.