am 779a6e41: (-s ours) am eb43f1b2: am ef5afa07: (-s ours) Do not merge. Don\'t crash when extra logging is enabled.
Merge commit '779a6e41d7e5cdb27b802551249257d600dc2d27' * commit '779a6e41d7e5cdb27b802551249257d600dc2d27': Do not merge.
This commit is contained in: