Fixing an issue with the history plugin
Merge remote-tracking branch 'origin/master' into guzzle4-on-php-5-3