Merge remote-tracking branch 'upstream/master'

Conflicts:
	gapi/api/__init__.py
	gapi/api/directory.py
	gapi/api/drive.py
	gapi/gapi_utils.py
	gapi/service.py