am b51d3298: Merge commit \'826b23851575eece3a3d1ae3bfba73b0060a36f8\' into HEAD

* commit 'b51d32984add6ffc67ad9b1f6e2da5a41fa422df':