Bug2114 20130607a

I'm sorry I haven't tested this - my dreamhack is still way out of date.  But this is a straightforward codemerge, which will hopefully fix a problem that people are complaining about in support and make Kat happy.