am 57c2b4c8: Merge commit \'f0aa90f7898502aae6a015b49abcb2a5a0719fad\' into HEAD

* commit '57c2b4c8aa5d66cb3198770d1a71f299b8b14470':