Merge branch '431_issue_v1_4_11' into '1-4-stable'

Fix issue 431 in v1-stable

See merge request oauth-xx/oauth2!637

Author: pboling

lib/oauth2/client.rb

@@ -166,7 +166,11 @@ def get_token(params, access_token_opts = {}, extract_access_token = options[:ex
       opts = {:raise_errors => options[:raise_errors], :parse => params.delete(:parse)}
       headers = params.delete(:headers) || {}
       if options[:token_method] == :post
-        opts[:body] = params
+        opts[:body] = if headers['Content-Type'] == 'application/json'
+                        params.to_json
+                      else
+                        params
+                      end
         opts[:headers] = {'Content-Type' => 'application/x-www-form-urlencoded'}
       else
         opts[:params] = params