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

* commit 'ebcb32f58a6220802ca129ea33f47b4b69931a10':