Merge remote-tracking branch 'screeley/master'

Conflicts:
	tornado/simple_httpclient.py

diff --cc tornado/simple_httpclient.py
index 155012fcc16472076a021a06c5ffa87750473ff5,ec3adf50d4befebcfb73c48e03dc7737e2fa236f..80b3fb052ce91fb4d508afbf76ca4230bba650f0
--- 1/tornado/simple_httpclient.py
--- 2/tornado/simple_httpclient.py
+++ b/tornado/simple_httpclient.py
@@@ -123,7 -121,7 +123,7 @@@ class SimpleAsyncHTTPClient(AsyncHTTPCl
  
  
  class _HTTPConnection(object):
-     _SUPPORTED_METHODS = set(["GET", "HEAD", "POST", "PATCH", "PUT", "DELETE"])
 -    _SUPPORTED_METHODS = set(["GET", "HEAD", "POST", "PUT", "DELETE", "OPTIONS"])
++    _SUPPORTED_METHODS = set(["GET", "HEAD", "POST", "PUT", "DELETE", "PATCH", "OPTIONS"])
  
      def __init__(self, io_loop, client, request, release_callback,
                   final_callback, max_buffer_size):

diff --cc tornado/test/simple_httpclient_test.py
Simple merge