am b6089cca: Merge commit \'0afd5a4d782037ea641d75d595cf5d38ed6978ac\' into HEAD

* commit 'b6089cca5248f19832dde54faaad62891ff8bd25':