Merge commit 'sjmurdoch/xxx-using-spdy'