am c777e8df: Merge commit \'2c69188d9160b5e71ccffa6e42759c12fdb5965c\' into HEAD

* commit 'c777e8df408ea2bac6e283d0e9986725e8b41330':