337cf910b3
Merge commit 'eccd6fdd0d86b8610b738fc15c707eedc00ec9dc' * commit 'eccd6fdd0d86b8610b738fc15c707eedc00ec9dc': Fix bug 2043140.