Merge branch 'hotfix/2.1.10'
Use guzzle/guzzle for PHP >= 5.3.
Merge branch 'hotfix/2.1.11' into develop