am aed8749a: am 512bac62: Merge commit \'4102af05a86aae36d2560fd8b3f740a52399342c\' into HEAD

* commit 'aed8749a52e5e9c922ac7674f0ef3d4d883b00dc':