am c4bb5d41: Merge change I3c675fc6 into eclair

Merge commit 'c4bb5d411614765e0f93cbd257dc8172c39d913d' into eclair-mr2

* commit 'c4bb5d411614765e0f93cbd257dc8172c39d913d':
  New defaults for Passion