am de8c8069: Merge commit \'1ee45c2d2d816ee912624d81ff1b0aaa98e8fa74\' into HEAD

* commit 'de8c80692b0b2fcef705ba9b417477d2bba81e75':