am b6fd742f: Merge commit \'d0792d40dafce044bbf0f10f2c680120ded8c203\' into HEAD

* commit 'b6fd742f76bc84af4e1035fdd250549a6a7f837e':