am 7dba1856: am cb44b4d4: am a1b02556: Merge change I3134655d into eclair

Merge commit '7dba1856d92c9b4c34776dc8ceab8af4c9bae8b8'

* commit '7dba1856d92c9b4c34776dc8ceab8af4c9bae8b8':
  More capabilities for default home configuration