diff --git a/examples/app.example.yaml b/examples/app.example.yaml
index b0fe2879..60a8add5 100644
--- a/examples/app.example.yaml
+++ b/examples/app.example.yaml
@@ -1,7 +1,7 @@
 #  For Google App Engine deployment, copy this file to app.yaml
 #  and edit as required
-#  See http://code.google.com/appengine/docs/python/config/appconfig.html
-#  and http://web2py.com/book/default/chapter/11?search=app.yaml
+#  See https://cloud.google.com/appengine/docs/standard/python/config/appref
+#  and http://www.web2py.com/book/default/chapter/13#Deploying-on-Google-App-Engine
 
 application: yourappname
 version: 1
diff --git a/gluon/main.py b/gluon/main.py
index b6c03fcd..aeb7f76e 100644
--- a/gluon/main.py
+++ b/gluon/main.py
@@ -357,7 +357,7 @@ def wsgibase(environ, responder):
 
                 request.update(
                     client=client,
-                    folder=abspath('applications', app) + os.sep,
+                    folder=abspath('applications', app),
                     ajax=x_req_with == 'xmlhttprequest',
                     cid=env.http_web2py_component_element,
                     is_local=(env.remote_addr in local_hosts and client == env.remote_addr),
diff --git a/gluon/packages/dal b/gluon/packages/dal
index 49c5ec28..e973f27b 160000
--- a/gluon/packages/dal
+++ b/gluon/packages/dal
@@ -1 +1 @@
-Subproject commit 49c5ec284d2af7593f8e3f62f0cd95b043b3ccee
+Subproject commit e973f27b69a8499e4e30e5663f3fba74bf87364c