Merge branch 'master' of https://github.com/web2py/web2py into pydal-sm

Conflicts:
	gluon/dal/adapters/postgres.py
	gluon/dal/objects.py

gluon/cache.py

@@ -282,6 +282,17 @@ class CacheOnDisk(CacheAbstract):
                     ]
 
                 def replace_windows(src, dst):
+                    """
+                    The Windows filesystem has a 256 character limit for the filename.
+                    To use filenames longer than that, the '\\?\' prefix needs to be used.
+                    By default, this prefix is added to all windows filenames, 
+                    when accessing it. 
+                    View this for details: http://stackoverflow.com/a/23230380/348142
+                    """
+                    windows_prefix = "\\\\?\\"
+                    dst = windows_prefix + dst
+                    src = windows_prefix + src
+
                     if not ReplaceFile(dst, src, None, 0, 0, 0):
                         os.rename(src, dst)
 

scripts/setup-web2py-centos7.sh

@@ -56,7 +56,7 @@ echo
 yum update
 
 # Install required packages
-yum install httpd mod_ssl mod_wsgi wget python
+yum install httpd mod_ssl mod_wsgi wget python unzip
 
 ###
 ### Phase 2 - Install web2py