Merge branch 'master' into put_support

Conflicts:
	src/Dropbox/OAuth/Curl.php