am a18cc111: am 56235cbd: Merge commit \'4fb68e5dd4e93c7599dc905d861de11ac39c5585\' into HEAD

* commit 'a18cc111cea31a23de108aacbb02a888f62ab4be':