Merge remote-tracking branch 'origin/sc1467-1' into sc1467-1

# Conflicts:
#	scrapinghub/client.py
#	scrapinghub/exceptions.py

Author: chekunkov