am f57b1e03: am e0f497fe: Merge commit \'54ec4ff7dfa9e8028f9da1986a73bddb1c00be93\' into HEAD

* commit 'f57b1e036df456a05d994fcebd6c3050b6157460':