Merge remote branch into oauth2

Author: rayluo

.gitignore

@@ -48,3 +48,7 @@ src/build
 # Visual Studio Files
 /.vs/*
 /tests/.vs/*
+
+# The test configuration file(s) could potentially contain credentials
+tests/config.json
+

tests/test_client.py

@@ -6,6 +6,10 @@
 except:  # Python 3
     from urllib.parse import urljoin
 import time
+try:
+    FileNotFoundError  # Python 3
+except NameError:
+    FileNotFoundError = IOError  # Python 2
 
 import requests