Merge branch 'master' into specify-python-version

Author: djw8605

setup.py

@@ -42,7 +42,7 @@
     # For a discussion on single-sourcing the version across setup.py and the
     # project code, see
     # https://packaging.python.org/en/latest/single_source_version.html
-    version='5.3.0',  # Required
+    version='5.4.0',  # Required
 
     # This is a one-line description or tagline of what your project does. This
     # corresponds to the "Summary" metadata field:

stashcp.py

@@ -24,7 +24,7 @@
 from urlparse import urlparse
 
 # Version information for user-agent
-VERSION = "5.3.0"
+VERSION = "5.4.0"
 
 main_redirector = "root://redirector.osgstorage.org"
 stash_origin = "root://stash.osgconnect.net"