am 8c22f861: Merge commit \'05fa6fe6de8d3a3b9f2d0d70533bd911ec9094be\' into HEAD

* commit '8c22f86128c2f64c57e5c7b6f294d5879feae124':