am e1d13d9e: Merge commit \'1ed341977485618189efe926120b291f0df3d33a\' into HEAD

* commit 'e1d13d9ec7bc47e29253a4448c361d84b52ecd88':