Merge remote-tracking branch 'upstream/master'

Conflicts:
	hellosign/hellosign.py
	setup.py