am d7a5aaee: am ebcb32f5: Merge commit \'bac61807d3bcfff957b358cb9ad77850bd373689\' into HEAD

* commit 'd7a5aaee145879804006d2c00daa4c14d544e03a':