Commit 6a0d2b43ee4a32b2894d3c2b7c798c4eb4853534

Carlos Martín Nieto 2014-08-27T15:09:07

Merge remote-tracking branch 'upstream/master' into cmn/ssh-retry