Merge guzzle change from develop to master for deploy