am 29759e9d: Merge commit \'25c2b2f670a3b11f7ce78eccde10c1a79188c9a8\' into HEAD

* commit '29759e9d518880adba366c502cf79d53c48a31bb':