diff --git a/docs/oauth2client.appengine.html b/docs/oauth2client.appengine.html
index 72d4be9..61f90f7 100644
--- a/docs/oauth2client.appengine.html
+++ b/docs/oauth2client.appengine.html
@@ -8,7 +8,7 @@
 <td valign=bottom>&nbsp;<br>
 <font color="#ffffff" face="helvetica, arial">&nbsp;<br><big><big><strong><a href="oauth2client.html"><font color="#ffffff">oauth2client</font></a>.appengine</strong></big></big></font></td
 ><td align=right valign=bottom
-><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="file:/usr/local/google/home/jcgregorio/projects/apiclient-release/oauth2client/appengine.py">/usr/local/google/home/jcgregorio/projects/apiclient-release/oauth2client/appengine.py</a></font></td></tr></table>
+><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="file:/home/jcgregorio/projects/apiclient/oauth2client/appengine.py">/home/jcgregorio/projects/apiclient/oauth2client/appengine.py</a></font></td></tr></table>
     <p><tt>Utilities&nbsp;for&nbsp;Google&nbsp;App&nbsp;Engine<br>
 &nbsp;<br>
 Utilities&nbsp;for&nbsp;making&nbsp;it&nbsp;easier&nbsp;to&nbsp;use&nbsp;OAuth&nbsp;2.0&nbsp;on&nbsp;Google&nbsp;App&nbsp;Engine.</tt></p>
@@ -19,7 +19,7 @@
 <font color="#ffffff" face="helvetica, arial"><big><strong>Modules</strong></big></font></td></tr>
     
 <tr><td bgcolor="#aa55cc"><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</tt></td><td>&nbsp;</td>
-<td width="100%"><table width="100%" summary="list"><tr><td width="25%" valign=top><a href="google.appengine.api.app_identity.app_identity.html">google.appengine.api.app_identity.app_identity</a><br>
+<td width="100%"><table width="100%" summary="list"><tr><td width="25%" valign=top><a href="google.appengine.api.app_identity.html">google.appengine.api.app_identity</a><br>
 <a href="base64.html">base64</a><br>
 <a href="oauth2client.clientsecrets.html">oauth2client.clientsecrets</a><br>
 </td><td width="25%" valign=top><a href="google.appengine.ext.db.html">google.appengine.ext.db</a><br>
@@ -69,7 +69,7 @@
 </font></dt><dt><font face="helvetica, arial"><a href="oauth2client.appengine.html#FlowProperty">FlowProperty</a>
 </font></dt></dl>
 </dd>
-<dt><font face="helvetica, arial"><a href="google.appengine.ext.webapp.html#RequestHandler">google.appengine.ext.webapp.RequestHandler</a>(<a href="__builtin__.html#object">__builtin__.object</a>)
+<dt><font face="helvetica, arial"><a href="google.appengine.ext.webapp._webapp25.html#RequestHandler">google.appengine.ext.webapp._webapp25.RequestHandler</a>(<a href="__builtin__.html#object">__builtin__.object</a>)
 </font></dt><dd>
 <dl>
 <dt><font face="helvetica, arial"><a href="oauth2client.appengine.html#OAuth2Handler">OAuth2Handler</a>
@@ -100,11 +100,7 @@
 This&nbsp;<a href="__builtin__.html#object">object</a>&nbsp;will&nbsp;allow&nbsp;an&nbsp;App&nbsp;Engine&nbsp;application&nbsp;to&nbsp;identify&nbsp;itself&nbsp;to&nbsp;Google<br>
 and&nbsp;other&nbsp;OAuth&nbsp;2.0&nbsp;servers&nbsp;that&nbsp;can&nbsp;verify&nbsp;assertions.&nbsp;It&nbsp;can&nbsp;be&nbsp;used&nbsp;for<br>
 the&nbsp;purpose&nbsp;of&nbsp;accessing&nbsp;data&nbsp;stored&nbsp;under&nbsp;an&nbsp;account&nbsp;assigned&nbsp;to&nbsp;the&nbsp;App<br>
-Engine&nbsp;application&nbsp;itself.&nbsp;The&nbsp;algorithm&nbsp;used&nbsp;for&nbsp;generating&nbsp;the&nbsp;assertion&nbsp;is<br>
-the&nbsp;Signed&nbsp;JSON&nbsp;Web&nbsp;Token&nbsp;(JWT)&nbsp;algorithm.&nbsp;Additional&nbsp;details&nbsp;can&nbsp;be&nbsp;found&nbsp;at<br>
-the&nbsp;following&nbsp;link:<br>
-&nbsp;<br>
-<a href="http://self-issued.info/docs/draft-jones-json-web-token.html">http://self-issued.info/docs/draft-jones-json-web-token.html</a><br>
+Engine&nbsp;application&nbsp;itself.<br>
 &nbsp;<br>
 This&nbsp;credential&nbsp;does&nbsp;not&nbsp;require&nbsp;a&nbsp;flow&nbsp;to&nbsp;instantiate&nbsp;because&nbsp;it&nbsp;represents<br>
 a&nbsp;two&nbsp;legged&nbsp;flow,&nbsp;and&nbsp;therefore&nbsp;has&nbsp;all&nbsp;of&nbsp;the&nbsp;required&nbsp;information&nbsp;to<br>
@@ -119,17 +115,10 @@
 </dl>
 <hr>
 Methods defined here:<br>
-<dl><dt><a name="AppAssertionCredentials-__init__"><strong>__init__</strong></a>(self, scope, audience<font color="#909090">='https://accounts.google.com/o/oauth2/token'</font>, assertion_type<font color="#909090">='http://oauth.net/grant_type/jwt/1.0/bearer'</font>, token_uri<font color="#909090">='https://accounts.google.com/o/oauth2/token'</font>, **kwargs)</dt><dd><tt>Constructor&nbsp;for&nbsp;<a href="#AppAssertionCredentials">AppAssertionCredentials</a><br>
+<dl><dt><a name="AppAssertionCredentials-__init__"><strong>__init__</strong></a>(self, scope, **kwargs)</dt><dd><tt>Constructor&nbsp;for&nbsp;<a href="#AppAssertionCredentials">AppAssertionCredentials</a><br>
 &nbsp;<br>
 Args:<br>
-&nbsp;&nbsp;scope:&nbsp;string,&nbsp;scope&nbsp;of&nbsp;the&nbsp;credentials&nbsp;being&nbsp;requested.<br>
-&nbsp;&nbsp;audience:&nbsp;string,&nbsp;The&nbsp;audience,&nbsp;or&nbsp;verifier&nbsp;of&nbsp;the&nbsp;assertion.&nbsp;&nbsp;For<br>
-&nbsp;&nbsp;&nbsp;&nbsp;convenience&nbsp;defaults&nbsp;to&nbsp;Google's&nbsp;audience.<br>
-&nbsp;&nbsp;assertion_type:&nbsp;string,&nbsp;Type&nbsp;name&nbsp;that&nbsp;will&nbsp;identify&nbsp;the&nbsp;format&nbsp;of&nbsp;the<br>
-&nbsp;&nbsp;&nbsp;&nbsp;assertion&nbsp;string.&nbsp;&nbsp;For&nbsp;convience,&nbsp;defaults&nbsp;to&nbsp;the&nbsp;JSON&nbsp;Web&nbsp;Token&nbsp;(JWT)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;assertion&nbsp;type&nbsp;string.<br>
-&nbsp;&nbsp;token_uri:&nbsp;string,&nbsp;URI&nbsp;for&nbsp;token&nbsp;endpoint.&nbsp;For&nbsp;convenience<br>
-&nbsp;&nbsp;&nbsp;&nbsp;defaults&nbsp;to&nbsp;Google's&nbsp;endpoints&nbsp;but&nbsp;any&nbsp;OAuth&nbsp;2.0&nbsp;provider&nbsp;can&nbsp;be&nbsp;used.</tt></dd></dl>
+&nbsp;&nbsp;scope:&nbsp;string&nbsp;or&nbsp;list&nbsp;of&nbsp;strings,&nbsp;scope(s)&nbsp;of&nbsp;the&nbsp;credentials&nbsp;being&nbsp;requested.</tt></dd></dl>
 
 <hr>
 Class methods defined here:<br>
@@ -567,7 +556,7 @@
 an&nbsp;HTTP&nbsp;transport.<br>
 &nbsp;<br>
 Subclasses&nbsp;must&nbsp;also&nbsp;specify&nbsp;a&nbsp;classmethod&nbsp;named&nbsp;'from_json'&nbsp;that&nbsp;takes&nbsp;a&nbsp;JSON<br>
-string&nbsp;as&nbsp;input&nbsp;and&nbsp;returns&nbsp;an&nbsp;instaniated&nbsp;Crentials&nbsp;<a href="__builtin__.html#object">object</a>.</tt></dl>
+string&nbsp;as&nbsp;input&nbsp;and&nbsp;returns&nbsp;an&nbsp;instaniated&nbsp;Credentials&nbsp;<a href="__builtin__.html#object">object</a>.</tt></dl>
 
 <hr>
 Methods inherited from <a href="google.appengine.ext.db.html#Property">google.appengine.ext.db.Property</a>:<br>
@@ -624,6 +613,20 @@
 &nbsp;&nbsp;True&nbsp;if&nbsp;this&nbsp;value&nbsp;is&nbsp;considered&nbsp;empty&nbsp;in&nbsp;the&nbsp;context&nbsp;of&nbsp;this&nbsp;<a href="google.appengine.ext.db.html#Property">Property</a><br>
 &nbsp;&nbsp;type,&nbsp;otherwise&nbsp;False.</tt></dd></dl>
 
+<dl><dt><a name="CredentialsProperty-get_updated_value_for_datastore"><strong>get_updated_value_for_datastore</strong></a>(self, model_instance)</dt><dd><tt>Determine&nbsp;new&nbsp;value&nbsp;for&nbsp;auto-updated&nbsp;property.<br>
+&nbsp;<br>
+Some&nbsp;properies&nbsp;(e.g.&nbsp;DateTimeProperty,&nbsp;UserProperty)&nbsp;optionally&nbsp;update&nbsp;their<br>
+value&nbsp;on&nbsp;every&nbsp;put().&nbsp;This&nbsp;call&nbsp;must&nbsp;return&nbsp;the&nbsp;new&nbsp;desired&nbsp;value&nbsp;for&nbsp;such<br>
+properties.&nbsp;For&nbsp;all&nbsp;other&nbsp;properties,&nbsp;this&nbsp;call&nbsp;must&nbsp;return<br>
+AUTO_UPDATE_UNCHANGED.<br>
+&nbsp;<br>
+Args:<br>
+&nbsp;&nbsp;model_instance:&nbsp;Instance&nbsp;to&nbsp;get&nbsp;new&nbsp;value&nbsp;for.<br>
+&nbsp;<br>
+Returns:<br>
+&nbsp;&nbsp;Datastore&nbsp;representation&nbsp;of&nbsp;the&nbsp;new&nbsp;model&nbsp;value&nbsp;in&nbsp;a&nbsp;form&nbsp;that&nbsp;is<br>
+&nbsp;&nbsp;appropriate&nbsp;for&nbsp;storing&nbsp;in&nbsp;the&nbsp;datastore,&nbsp;or&nbsp;AUTO_UPDATE_UNCHANGED.</tt></dd></dl>
+
 <hr>
 Data descriptors inherited from <a href="google.appengine.ext.db.html#Property">google.appengine.ext.db.Property</a>:<br>
 <dl><dt><strong>__dict__</strong></dt>
@@ -709,6 +712,20 @@
 Returns:<br>
 &nbsp;&nbsp;Default&nbsp;value&nbsp;as&nbsp;provided&nbsp;by&nbsp;<a href="#FlowProperty-__init__">__init__</a>(default).</tt></dd></dl>
 
+<dl><dt><a name="FlowProperty-get_updated_value_for_datastore"><strong>get_updated_value_for_datastore</strong></a>(self, model_instance)</dt><dd><tt>Determine&nbsp;new&nbsp;value&nbsp;for&nbsp;auto-updated&nbsp;property.<br>
+&nbsp;<br>
+Some&nbsp;properies&nbsp;(e.g.&nbsp;DateTimeProperty,&nbsp;UserProperty)&nbsp;optionally&nbsp;update&nbsp;their<br>
+value&nbsp;on&nbsp;every&nbsp;put().&nbsp;This&nbsp;call&nbsp;must&nbsp;return&nbsp;the&nbsp;new&nbsp;desired&nbsp;value&nbsp;for&nbsp;such<br>
+properties.&nbsp;For&nbsp;all&nbsp;other&nbsp;properties,&nbsp;this&nbsp;call&nbsp;must&nbsp;return<br>
+AUTO_UPDATE_UNCHANGED.<br>
+&nbsp;<br>
+Args:<br>
+&nbsp;&nbsp;model_instance:&nbsp;Instance&nbsp;to&nbsp;get&nbsp;new&nbsp;value&nbsp;for.<br>
+&nbsp;<br>
+Returns:<br>
+&nbsp;&nbsp;Datastore&nbsp;representation&nbsp;of&nbsp;the&nbsp;new&nbsp;model&nbsp;value&nbsp;in&nbsp;a&nbsp;form&nbsp;that&nbsp;is<br>
+&nbsp;&nbsp;appropriate&nbsp;for&nbsp;storing&nbsp;in&nbsp;the&nbsp;datastore,&nbsp;or&nbsp;AUTO_UPDATE_UNCHANGED.</tt></dd></dl>
+
 <hr>
 Data descriptors inherited from <a href="google.appengine.ext.db.html#Property">google.appengine.ext.db.Property</a>:<br>
 <dl><dt><strong>__dict__</strong></dt>
@@ -791,7 +808,7 @@
 <td colspan=2><tt>Utility&nbsp;for&nbsp;making&nbsp;OAuth&nbsp;2.0&nbsp;easier.<br>
 &nbsp;<br>
 Instantiate&nbsp;and&nbsp;then&nbsp;use&nbsp;with&nbsp;oauth_required&nbsp;or&nbsp;oauth_aware<br>
-as&nbsp;decorators&nbsp;on&nbsp;webapp.<a href="google.appengine.ext.webapp.html#RequestHandler">RequestHandler</a>&nbsp;methods.<br>
+as&nbsp;decorators&nbsp;on&nbsp;webapp.<a href="google.appengine.ext.webapp._webapp25.html#RequestHandler">RequestHandler</a>&nbsp;methods.<br>
 &nbsp;<br>
 Example:<br>
 &nbsp;<br>
@@ -801,7 +818,7 @@
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;scope='https://www.googleapis.com/auth/plus')<br>
 &nbsp;<br>
 &nbsp;<br>
-&nbsp;&nbsp;class&nbsp;MainHandler(webapp.<a href="google.appengine.ext.webapp.html#RequestHandler">RequestHandler</a>):<br>
+&nbsp;&nbsp;class&nbsp;MainHandler(webapp.<a href="google.appengine.ext.webapp._webapp25.html#RequestHandler">RequestHandler</a>):<br>
 &nbsp;<br>
 &nbsp;&nbsp;&nbsp;&nbsp;@decorator.oauth_required<br>
 &nbsp;&nbsp;&nbsp;&nbsp;def&nbsp;get(self):<br>
@@ -830,12 +847,12 @@
 
 <dl><dt><a name="OAuth2Decorator-authorize_url"><strong>authorize_url</strong></a>(self)</dt><dd><tt>Returns&nbsp;the&nbsp;URL&nbsp;to&nbsp;start&nbsp;the&nbsp;OAuth&nbsp;dance.<br>
 &nbsp;<br>
-Must&nbsp;only&nbsp;be&nbsp;called&nbsp;from&nbsp;with&nbsp;a&nbsp;webapp.<a href="google.appengine.ext.webapp.html#RequestHandler">RequestHandler</a>&nbsp;subclassed&nbsp;method<br>
+Must&nbsp;only&nbsp;be&nbsp;called&nbsp;from&nbsp;with&nbsp;a&nbsp;webapp.<a href="google.appengine.ext.webapp._webapp25.html#RequestHandler">RequestHandler</a>&nbsp;subclassed&nbsp;method<br>
 that&nbsp;had&nbsp;been&nbsp;decorated&nbsp;with&nbsp;either&nbsp;@oauth_required&nbsp;or&nbsp;@oauth_aware.</tt></dd></dl>
 
 <dl><dt><a name="OAuth2Decorator-has_credentials"><strong>has_credentials</strong></a>(self)</dt><dd><tt>True&nbsp;if&nbsp;for&nbsp;the&nbsp;logged&nbsp;in&nbsp;user&nbsp;there&nbsp;are&nbsp;valid&nbsp;access&nbsp;Credentials.<br>
 &nbsp;<br>
-Must&nbsp;only&nbsp;be&nbsp;called&nbsp;from&nbsp;with&nbsp;a&nbsp;webapp.<a href="google.appengine.ext.webapp.html#RequestHandler">RequestHandler</a>&nbsp;subclassed&nbsp;method<br>
+Must&nbsp;only&nbsp;be&nbsp;called&nbsp;from&nbsp;with&nbsp;a&nbsp;webapp.<a href="google.appengine.ext.webapp._webapp25.html#RequestHandler">RequestHandler</a>&nbsp;subclassed&nbsp;method<br>
 that&nbsp;had&nbsp;been&nbsp;decorated&nbsp;with&nbsp;either&nbsp;@oauth_required&nbsp;or&nbsp;@oauth_aware.</tt></dd></dl>
 
 <dl><dt><a name="OAuth2Decorator-http"><strong>http</strong></a>(self)</dt><dd><tt>Returns&nbsp;an&nbsp;authorized&nbsp;http&nbsp;instance.<br>
@@ -853,7 +870,7 @@
 and&nbsp;<a href="#OAuth2Decorator-authorize_url">authorize_url</a>()&nbsp;methods&nbsp;can&nbsp;be&nbsp;called.<br>
 &nbsp;<br>
 Args:<br>
-&nbsp;&nbsp;method:&nbsp;callable,&nbsp;to&nbsp;be&nbsp;decorated&nbsp;method&nbsp;of&nbsp;a&nbsp;webapp.<a href="google.appengine.ext.webapp.html#RequestHandler">RequestHandler</a><br>
+&nbsp;&nbsp;method:&nbsp;callable,&nbsp;to&nbsp;be&nbsp;decorated&nbsp;method&nbsp;of&nbsp;a&nbsp;webapp.<a href="google.appengine.ext.webapp._webapp25.html#RequestHandler">RequestHandler</a><br>
 &nbsp;&nbsp;&nbsp;&nbsp;instance.</tt></dd></dl>
 
 <dl><dt><a name="OAuth2Decorator-oauth_required"><strong>oauth_required</strong></a>(self, method)</dt><dd><tt>Decorator&nbsp;that&nbsp;starts&nbsp;the&nbsp;OAuth&nbsp;2.0&nbsp;dance.<br>
@@ -862,7 +879,7 @@
 granted&nbsp;access&nbsp;for&nbsp;this&nbsp;application.<br>
 &nbsp;<br>
 Args:<br>
-&nbsp;&nbsp;method:&nbsp;callable,&nbsp;to&nbsp;be&nbsp;decorated&nbsp;method&nbsp;of&nbsp;a&nbsp;webapp.<a href="google.appengine.ext.webapp.html#RequestHandler">RequestHandler</a><br>
+&nbsp;&nbsp;method:&nbsp;callable,&nbsp;to&nbsp;be&nbsp;decorated&nbsp;method&nbsp;of&nbsp;a&nbsp;webapp.<a href="google.appengine.ext.webapp._webapp25.html#RequestHandler">RequestHandler</a><br>
 &nbsp;&nbsp;&nbsp;&nbsp;instance.</tt></dd></dl>
 
 <hr>
@@ -892,7 +909,7 @@
 &nbsp;&nbsp;&nbsp;&nbsp;scope='https://www.googleapis.com/auth/plus')<br>
 &nbsp;<br>
 &nbsp;<br>
-&nbsp;&nbsp;class&nbsp;MainHandler(webapp.<a href="google.appengine.ext.webapp.html#RequestHandler">RequestHandler</a>):<br>
+&nbsp;&nbsp;class&nbsp;MainHandler(webapp.<a href="google.appengine.ext.webapp._webapp25.html#RequestHandler">RequestHandler</a>):<br>
 &nbsp;<br>
 &nbsp;&nbsp;&nbsp;&nbsp;@decorator.oauth_required<br>
 &nbsp;&nbsp;&nbsp;&nbsp;def&nbsp;get(self):<br>
@@ -911,7 +928,8 @@
 &nbsp;<br>
 Args:<br>
 &nbsp;&nbsp;filename:&nbsp;string,&nbsp;File&nbsp;name&nbsp;of&nbsp;client&nbsp;secrets.<br>
-&nbsp;&nbsp;scope:&nbsp;string,&nbsp;Space&nbsp;separated&nbsp;list&nbsp;of&nbsp;scopes.<br>
+&nbsp;&nbsp;scope:&nbsp;string&nbsp;or&nbsp;list&nbsp;of&nbsp;strings,&nbsp;scope(s)&nbsp;of&nbsp;the&nbsp;credentials&nbsp;being<br>
+&nbsp;&nbsp;&nbsp;&nbsp;requested.<br>
 &nbsp;&nbsp;message:&nbsp;string,&nbsp;A&nbsp;friendly&nbsp;string&nbsp;to&nbsp;display&nbsp;to&nbsp;the&nbsp;user&nbsp;if&nbsp;the<br>
 &nbsp;&nbsp;&nbsp;&nbsp;clientsecrets&nbsp;file&nbsp;is&nbsp;missing&nbsp;or&nbsp;invalid.&nbsp;The&nbsp;message&nbsp;may&nbsp;contain&nbsp;HTML&nbsp;and<br>
 &nbsp;&nbsp;&nbsp;&nbsp;will&nbsp;be&nbsp;presented&nbsp;on&nbsp;the&nbsp;web&nbsp;interface&nbsp;for&nbsp;any&nbsp;method&nbsp;that&nbsp;uses&nbsp;the<br>
@@ -921,12 +939,12 @@
 Methods inherited from <a href="oauth2client.appengine.html#OAuth2Decorator">OAuth2Decorator</a>:<br>
 <dl><dt><a name="OAuth2DecoratorFromClientSecrets-authorize_url"><strong>authorize_url</strong></a>(self)</dt><dd><tt>Returns&nbsp;the&nbsp;URL&nbsp;to&nbsp;start&nbsp;the&nbsp;OAuth&nbsp;dance.<br>
 &nbsp;<br>
-Must&nbsp;only&nbsp;be&nbsp;called&nbsp;from&nbsp;with&nbsp;a&nbsp;webapp.<a href="google.appengine.ext.webapp.html#RequestHandler">RequestHandler</a>&nbsp;subclassed&nbsp;method<br>
+Must&nbsp;only&nbsp;be&nbsp;called&nbsp;from&nbsp;with&nbsp;a&nbsp;webapp.<a href="google.appengine.ext.webapp._webapp25.html#RequestHandler">RequestHandler</a>&nbsp;subclassed&nbsp;method<br>
 that&nbsp;had&nbsp;been&nbsp;decorated&nbsp;with&nbsp;either&nbsp;@oauth_required&nbsp;or&nbsp;@oauth_aware.</tt></dd></dl>
 
 <dl><dt><a name="OAuth2DecoratorFromClientSecrets-has_credentials"><strong>has_credentials</strong></a>(self)</dt><dd><tt>True&nbsp;if&nbsp;for&nbsp;the&nbsp;logged&nbsp;in&nbsp;user&nbsp;there&nbsp;are&nbsp;valid&nbsp;access&nbsp;Credentials.<br>
 &nbsp;<br>
-Must&nbsp;only&nbsp;be&nbsp;called&nbsp;from&nbsp;with&nbsp;a&nbsp;webapp.<a href="google.appengine.ext.webapp.html#RequestHandler">RequestHandler</a>&nbsp;subclassed&nbsp;method<br>
+Must&nbsp;only&nbsp;be&nbsp;called&nbsp;from&nbsp;with&nbsp;a&nbsp;webapp.<a href="google.appengine.ext.webapp._webapp25.html#RequestHandler">RequestHandler</a>&nbsp;subclassed&nbsp;method<br>
 that&nbsp;had&nbsp;been&nbsp;decorated&nbsp;with&nbsp;either&nbsp;@oauth_required&nbsp;or&nbsp;@oauth_aware.</tt></dd></dl>
 
 <dl><dt><a name="OAuth2DecoratorFromClientSecrets-http"><strong>http</strong></a>(self)</dt><dd><tt>Returns&nbsp;an&nbsp;authorized&nbsp;http&nbsp;instance.<br>
@@ -944,7 +962,7 @@
 and&nbsp;<a href="#OAuth2DecoratorFromClientSecrets-authorize_url">authorize_url</a>()&nbsp;methods&nbsp;can&nbsp;be&nbsp;called.<br>
 &nbsp;<br>
 Args:<br>
-&nbsp;&nbsp;method:&nbsp;callable,&nbsp;to&nbsp;be&nbsp;decorated&nbsp;method&nbsp;of&nbsp;a&nbsp;webapp.<a href="google.appengine.ext.webapp.html#RequestHandler">RequestHandler</a><br>
+&nbsp;&nbsp;method:&nbsp;callable,&nbsp;to&nbsp;be&nbsp;decorated&nbsp;method&nbsp;of&nbsp;a&nbsp;webapp.<a href="google.appengine.ext.webapp._webapp25.html#RequestHandler">RequestHandler</a><br>
 &nbsp;&nbsp;&nbsp;&nbsp;instance.</tt></dd></dl>
 
 <dl><dt><a name="OAuth2DecoratorFromClientSecrets-oauth_required"><strong>oauth_required</strong></a>(self, method)</dt><dd><tt>Decorator&nbsp;that&nbsp;starts&nbsp;the&nbsp;OAuth&nbsp;2.0&nbsp;dance.<br>
@@ -953,7 +971,7 @@
 granted&nbsp;access&nbsp;for&nbsp;this&nbsp;application.<br>
 &nbsp;<br>
 Args:<br>
-&nbsp;&nbsp;method:&nbsp;callable,&nbsp;to&nbsp;be&nbsp;decorated&nbsp;method&nbsp;of&nbsp;a&nbsp;webapp.<a href="google.appengine.ext.webapp.html#RequestHandler">RequestHandler</a><br>
+&nbsp;&nbsp;method:&nbsp;callable,&nbsp;to&nbsp;be&nbsp;decorated&nbsp;method&nbsp;of&nbsp;a&nbsp;webapp.<a href="google.appengine.ext.webapp._webapp25.html#RequestHandler">RequestHandler</a><br>
 &nbsp;&nbsp;&nbsp;&nbsp;instance.</tt></dd></dl>
 
 <hr>
@@ -968,14 +986,14 @@
 <table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
 <tr bgcolor="#ffc8d8">
 <td colspan=3 valign=bottom>&nbsp;<br>
-<font color="#000000" face="helvetica, arial"><a name="OAuth2Handler">class <strong>OAuth2Handler</strong></a>(<a href="google.appengine.ext.webapp.html#RequestHandler">google.appengine.ext.webapp.RequestHandler</a>)</font></td></tr>
+<font color="#000000" face="helvetica, arial"><a name="OAuth2Handler">class <strong>OAuth2Handler</strong></a>(<a href="google.appengine.ext.webapp._webapp25.html#RequestHandler">google.appengine.ext.webapp._webapp25.RequestHandler</a>)</font></td></tr>
     
 <tr bgcolor="#ffc8d8"><td rowspan=2><tt>&nbsp;&nbsp;&nbsp;</tt></td>
 <td colspan=2><tt>Handler&nbsp;for&nbsp;the&nbsp;redirect_uri&nbsp;of&nbsp;the&nbsp;OAuth&nbsp;2.0&nbsp;dance.<br>&nbsp;</tt></td></tr>
 <tr><td>&nbsp;</td>
 <td width="100%"><dl><dt>Method resolution order:</dt>
 <dd><a href="oauth2client.appengine.html#OAuth2Handler">OAuth2Handler</a></dd>
-<dd><a href="google.appengine.ext.webapp.html#RequestHandler">google.appengine.ext.webapp.RequestHandler</a></dd>
+<dd><a href="google.appengine.ext.webapp._webapp25.html#RequestHandler">google.appengine.ext.webapp._webapp25.RequestHandler</a></dd>
 <dd><a href="__builtin__.html#object">__builtin__.object</a></dd>
 </dl>
 <hr>
@@ -983,7 +1001,7 @@
 <dl><dt><a name="OAuth2Handler-get"><strong>get</strong></a> = check_login(self, *args)</dt></dl>
 
 <hr>
-Methods inherited from <a href="google.appengine.ext.webapp.html#RequestHandler">google.appengine.ext.webapp.RequestHandler</a>:<br>
+Methods inherited from <a href="google.appengine.ext.webapp._webapp25.html#RequestHandler">google.appengine.ext.webapp._webapp25.RequestHandler</a>:<br>
 <dl><dt><a name="OAuth2Handler-delete"><strong>delete</strong></a>(self, *args)</dt><dd><tt>Handler&nbsp;method&nbsp;for&nbsp;DELETE&nbsp;requests.</tt></dd></dl>
 
 <dl><dt><a name="OAuth2Handler-error"><strong>error</strong></a>(self, code)</dt><dd><tt>Clears&nbsp;the&nbsp;response&nbsp;output&nbsp;stream&nbsp;and&nbsp;sets&nbsp;the&nbsp;given&nbsp;HTTP&nbsp;error&nbsp;code.<br>
@@ -1019,7 +1037,7 @@
 <dl><dt><a name="OAuth2Handler-trace"><strong>trace</strong></a>(self, *args)</dt><dd><tt>Handler&nbsp;method&nbsp;for&nbsp;TRACE&nbsp;requests.</tt></dd></dl>
 
 <hr>
-Class methods inherited from <a href="google.appengine.ext.webapp.html#RequestHandler">google.appengine.ext.webapp.RequestHandler</a>:<br>
+Class methods inherited from <a href="google.appengine.ext.webapp._webapp25.html#RequestHandler">google.appengine.ext.webapp._webapp25.RequestHandler</a>:<br>
 <dl><dt><a name="OAuth2Handler-get_url"><strong>get_url</strong></a>(cls, *args, **kargs)<font color="#909090"><font face="helvetica, arial"> from <a href="__builtin__.html#type">__builtin__.type</a></font></font></dt><dd><tt>Returns&nbsp;the&nbsp;url&nbsp;for&nbsp;the&nbsp;given&nbsp;handler.<br>
 &nbsp;<br>
 The&nbsp;default&nbsp;implementation&nbsp;uses&nbsp;the&nbsp;patterns&nbsp;passed&nbsp;to&nbsp;the&nbsp;active<br>
@@ -1057,7 +1075,7 @@
 create&nbsp;a&nbsp;set&nbsp;of&nbsp;post&nbsp;handlers&nbsp;that&nbsp;will&nbsp;do&nbsp;simple&nbsp;text&nbsp;transformations<br>
 you&nbsp;can&nbsp;write:<br>
 &nbsp;<br>
-&nbsp;&nbsp;class&nbsp;ChangeTextHandler(webapp.<a href="google.appengine.ext.webapp.html#RequestHandler">RequestHandler</a>):<br>
+&nbsp;&nbsp;class&nbsp;ChangeTextHandler(webapp.<a href="google.appengine.ext.webapp._webapp25.html#RequestHandler">RequestHandler</a>):<br>
 &nbsp;<br>
 &nbsp;&nbsp;&nbsp;&nbsp;def&nbsp;<a href="#OAuth2Handler-__init__">__init__</a>(self,&nbsp;transform):<br>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;self.<strong>transform</strong>&nbsp;=&nbsp;transform<br>
@@ -1077,7 +1095,7 @@
 Text&nbsp;POSTed&nbsp;to&nbsp;/to_upper&nbsp;will&nbsp;be&nbsp;upper&nbsp;cased.</tt></dd></dl>
 
 <hr>
-Data descriptors inherited from <a href="google.appengine.ext.webapp.html#RequestHandler">google.appengine.ext.webapp.RequestHandler</a>:<br>
+Data descriptors inherited from <a href="google.appengine.ext.webapp._webapp25.html#RequestHandler">google.appengine.ext.webapp._webapp25.RequestHandler</a>:<br>
 <dl><dt><strong>__dict__</strong></dt>
 <dd><tt>dictionary&nbsp;for&nbsp;instance&nbsp;variables&nbsp;(if&nbsp;defined)</tt></dd>
 </dl>
@@ -1179,7 +1197,8 @@
 &nbsp;<br>
 Args:<br>
 &nbsp;&nbsp;filename:&nbsp;string,&nbsp;File&nbsp;name&nbsp;of&nbsp;client&nbsp;secrets.<br>
-&nbsp;&nbsp;scope:&nbsp;string,&nbsp;Space&nbsp;separated&nbsp;list&nbsp;of&nbsp;scopes.<br>
+&nbsp;&nbsp;scope:&nbsp;string&nbsp;or&nbsp;list&nbsp;of&nbsp;strings,&nbsp;scope(s)&nbsp;of&nbsp;the&nbsp;credentials&nbsp;being<br>
+&nbsp;&nbsp;&nbsp;&nbsp;requested.<br>
 &nbsp;&nbsp;message:&nbsp;string,&nbsp;A&nbsp;friendly&nbsp;string&nbsp;to&nbsp;display&nbsp;to&nbsp;the&nbsp;user&nbsp;if&nbsp;the<br>
 &nbsp;&nbsp;&nbsp;&nbsp;clientsecrets&nbsp;file&nbsp;is&nbsp;missing&nbsp;or&nbsp;invalid.&nbsp;The&nbsp;message&nbsp;may&nbsp;contain&nbsp;HTML&nbsp;and<br>
 &nbsp;&nbsp;&nbsp;&nbsp;will&nbsp;be&nbsp;presented&nbsp;on&nbsp;the&nbsp;web&nbsp;interface&nbsp;for&nbsp;any&nbsp;method&nbsp;that&nbsp;uses&nbsp;the<br>
@@ -1195,7 +1214,7 @@
 <tr><td bgcolor="#55aa55"><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</tt></td><td>&nbsp;</td>
 <td width="100%"><strong>OAUTH2CLIENT_NAMESPACE</strong> = 'oauth2client#ns'<br>
 <strong>__author__</strong> = 'jcgregorio@google.com (Joe Gregorio)'<br>
-<strong>application</strong> = &lt;google.appengine.ext.webapp.WSGIApplication object&gt;</td></tr></table><p>
+<strong>application</strong> = &lt;google.appengine.ext.webapp._webapp25.WSGIApplication object&gt;</td></tr></table><p>
 <table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
 <tr bgcolor="#7799ee">
 <td colspan=3 valign=bottom>&nbsp;<br>