am 106278c4: (-s ours) Merge change 21432 into eclair
Merge commit '106278c40271fec941a86e5eac66ae5c8477a56a'
* commit '106278c40271fec941a86e5eac66ae5c8477a56a':
do not merge: cherrypicked 3710f39096 from master branch
This commit is contained in: