am 4deb52f3: am 20777fae: am 584bce31: Merge change I09282f5b into eclair

Merge commit '4deb52f3c1a645ae2daa8dd31e72460ead2cd372'

* commit '4deb52f3c1a645ae2daa8dd31e72460ead2cd372':
  Fix the build (hopefully.)