Merge latest ging master

This may fix the problems we saw with Chrome 37, and perhaps the server crashing issues we've been seeing.

It may also introduce all sorts of new problems.  Let's find out!