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.