am 3b2774c1: am a16b0f4c: Merge "The generic failure case disappeared..."

* commit '3b2774c1c3109c6c7b7f6213ec849bde325a8a49':
  The generic failure case disappeared...