Merge branch 'master' into 3.3.x

* master:
  TS-2102 SPDY plugin tries to setup protocol handler too early.
  TS-1953: close this by adding an example & CHANGES
  fix indentation