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

* commit '512bac62a046e045e7e0beb874d90692e6033cbb':